Remove 3.0 deprecated API

Please refer following deprecation policy.

https://developer.tizen.org/development/training/native-application/understanding-tizen-programming/api-versioning-and-deprecation-policy-tizen-platform

[Version] 0.2.0
[Issue Type] Deprecation

Change-Id: I6efbb32ea1210b8aada5104d1a6de738f95a6824

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 8c37f5eae595e8f7e24bc327170de0229ee763e1..fdfff137c2a2127399ec4c1633445bd663cd0519 100755 (executable)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -87,7 +87,7 @@ CONFIGURE_FILE(
 )
 INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/${fw_name}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
 
-#ADD_SUBDIRECTORY(test)
+ADD_SUBDIRECTORY(test)
 
 IF(UNIX)
 

diff --git a/doc/tone_player_doc.h b/doc/tone_player_doc.h
index 2655858e5f2f566d94362b7e1ace477f64653d1f..291ece98de87a39208aa6ec5159fd61429136a24 100755 (executable)
--- a/doc/tone_player_doc.h
+++ b/doc/tone_player_doc.h
@@ -38,7 +38,7 @@
  *    \#include <tone_player.h>
  *
  * @section CAPI_MEDIA_TONE_PLAYER_OVERVIEW Overview
- * The @ref CAPI_MEDIA_TONE_PLAYER_MODULE API allows you to play and stop playing the tone. To play a particular type of tone(#tone_type_e), use tone_player_start(). To stop playing the tone, call tone_player_stop().
+ * The @ref CAPI_MEDIA_TONE_PLAYER_MODULE API allows you to play and stop playing the tone. To play a particular type of tone(#tone_type_e), use tone_player_start_new(). To stop playing the tone, call tone_player_stop().
  */
 
 #endif /* __TIZEN_MEDIA_TONE_PLAYER_DOC_H__ */

diff --git a/include/tone_player.h b/include/tone_player.h
index 1e8aff5f1ccaedc1ae395af0c64387f68c713f28..465a6784d2e77b2dd13fdb39719470747ab39b33 100755 (executable)
--- a/include/tone_player.h
+++ b/include/tone_player.h
@@ -180,32 +180,6 @@ typedef enum {
  * @{
  */
 
-
-/**
- * @deprecated Deprecated since 3.0. Use tone_player_start_new() instead.
- * @brief Plays a tone.
- *
- * @since_tizen @if MOBILE 2.3 @elseif WEARABLE 2.3.1 @endif
- *
- * @remarks Sound can be mixed with other sounds if you don't control the sound session in sound-manager module since 3.0.\n
- *     You can refer to @ref CAPI_MEDIA_SOUND_MANAGER_MODULE.
- *
- * @param[in] tone     The tone type to play
- * @param[in] type     The sound type
- * @param[in] duration_ms      The tone duration in milliseconds \n
- *                                 @c -1 indicates an infinite duration.
- * @param[out] id      The tone player ID ( can be set to @c NULL )
- *
- * @return @c 0 on success,
- *         otherwise a negative error value
- * @retval #TONE_PLAYER_ERROR_NONE Successful
- * @retval #TONE_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter
- * @retval #TONE_PLAYER_ERROR_INVALID_OPERATION Invalid operation
- *
- * @see tone_player_stop()
- */
-int tone_player_start(tone_type_e tone, sound_type_e type, int duration_ms, int *id) TIZEN_DEPRECATED_API;
-
 /**
  * @brief Plays a tone with stream information of sound-manager.
  *
@@ -244,7 +218,7 @@ int tone_player_start_new(tone_type_e tone, sound_stream_info_h stream_info, int
  * @retval #TONE_PLAYER_ERROR_INVALID_PARAMETER Invalid parameter
  * @retval #TONE_PLAYER_ERROR_INVALID_OPERATION Invalid operation
  *
- * @see tone_player_start()
+ * @see tone_player_start_new()
  */
 int tone_player_stop(int id);
 

diff --git a/packaging/capi-media-tone-player.spec b/packaging/capi-media-tone-player.spec
index 0e68f97ed89b970625ff9dd26ef9e58f74f8d424..0780885dba6b3fc02513ee656cf9a624379f2805 100755 (executable)
--- a/packaging/capi-media-tone-player.spec
+++ b/packaging/capi-media-tone-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-tone-player
 Summary:    A tone player library in Tizen C API
-Version:    0.1.15
+Version:    0.2.0
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/tone_player.c b/src/tone_player.c
index f1c21efe4862cb2c82ad2c1949bf699a7d969452..17b7ab79ae8a1ba065aa08e815158a72bff7bab0 100755 (executable)
--- a/src/tone_player.c
+++ b/src/tone_player.c
@@ -30,11 +30,6 @@
 #include <unistd.h>
 #include <dlog.h>
 
-
-#define DEPRECATED_WARN_INSTEAD(msg) do { \
-       LOGW("DEPRECATION WARNING: %s() is deprecated and will be removed from next release. Use %s() instead.", __func__, msg); \
-} while (0)
-
 static int __convert_tone_player_error_code(const char *func, int code)
 {
        int ret = TONE_PLAYER_ERROR_NONE;
@@ -59,24 +54,6 @@ static int __convert_tone_player_error_code(const char *func, int code)
        return ret;
 }
 
-int tone_player_start(tone_type_e tone, sound_type_e type, int duration_ms, int *id)
-{
-       int ret;
-       int player;
-
-       DEPRECATED_WARN_INSTEAD("tone_player_start_new");
-
-       if (tone < TONE_TYPE_DEFAULT || tone > TONE_TYPE_USER_DEFINED_HIGH_FRE)
-               return __convert_tone_player_error_code(__func__, TONE_PLAYER_ERROR_INVALID_PARAMETER);
-
-       ret = mm_sound_play_tone(tone, type , 1, duration_ms, &player);
-
-       if (ret == 0 && id != NULL)
-       *id = player;
-
-       return __convert_tone_player_error_code(__func__, ret);
-}
-
 int tone_player_start_new(tone_type_e tone, sound_stream_info_h stream_info, int duration_ms, int *id)
 {
        int ret;

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 74802decd88c4c5c04a26f6fe695cfaa5474bcd0..07a6abf1a0e7ca097b79a299208c6d7c54dbbf97 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -9,9 +9,6 @@ ENDFOREACH()
 
 SET(CMAKE_C_FLAGS "${CMAKE_C_FLAGS} ${EXTRA_CFLAGS} -Wall -pie")
 
-#ADD_EXECUTABLE("system-sensor" system-sensor.c)
-#TARGET_LINK_LIBRARIES("system-sensor" ${fw_name} ${${fw_test}_LDFLAGS})
-
 aux_source_directory(. sources)
 FOREACH(src ${sources})
     GET_FILENAME_COMPONENT(src_name ${src} NAME_WE)

diff --git a/test/multimedia_tone_player_test.c b/test/multimedia_tone_player_test.c
index 044e91353a17eb938d1c32d51f173904e44fee69..7aa38ddcb75a89daaa24cef6168d77ead5e5b5ee 100755 (executable)
--- a/test/multimedia_tone_player_test.c
+++ b/test/multimedia_tone_player_test.c
@@ -21,6 +21,7 @@
 #include <string.h>
 #include <stdlib.h>
 #include <getopt.h>
+#include <sound_manager.h>
 
 #define TONE_FIRST          TONE_TYPE_DTMF_0
 #define TONE_LAST           TONE_TYPE_USER_DEFINED_HIGH_FRE
@@ -47,9 +48,17 @@ void help()
                        "  -h, --help                help\n");
 }
 
+static void stream_focus_cb(sound_stream_info_h stream_info, sound_stream_focus_mask_e focus_mask, sound_stream_focus_state_e focus_state,
+                       sound_stream_focus_change_reason_e reason, int sound_behavior, const char *extra_info, void *user_data)
+{
+       return;
+}
+
+
 void tone_play_test(int from, int to, int duration, int sleep_time)
 {
        int i;
+       sound_stream_info_h stream_info;
 
        printf("From : %2d,   To : %2d,    Duration : %4d,  sleep_time : %4d\n", from, to, duration, sleep_time);
 
@@ -57,12 +66,19 @@ void tone_play_test(int from, int to, int duration, int sleep_time)
                printf("Wrong Parameter\n");
                return;
        }
+       
+       if (sound_manager_create_stream_information(SOUND_STREAM_TYPE_MEDIA, stream_focus_cb, NULL, &stream_info)) {
+               printf("failed to create stream info\n");
+               return;
+       }
 
        for (i = from; i <= to; i++) {
                printf("Play Tone : %d\n", i);
-               tone_player_start(i, SOUND_TYPE_MEDIA, duration, NULL);
+               tone_player_start_new(i, stream_info, duration, NULL);
                usleep(sleep_time * 1000);
        }
+       
+       sound_manager_destroy_stream_information(stream_info);
 }
 
 int main(int argc, char **argv)