Merge branch 'tizen_3.0' into tizen

Change-Id: I0ce0e94ee47a45ee5c8c805893fa588e655ff00f

diff --git a/include/tone_player.h b/include/tone_player.h
index fded30d1c5e8dac36c0f5332b0e424473f96f305..1e8aff5f1ccaedc1ae395af0c64387f68c713f28 100755 (executable)
--- a/include/tone_player.h
+++ b/include/tone_player.h
@@ -232,9 +232,6 @@ int tone_player_start(tone_type_e tone, sound_type_e type, int duration_ms, int
  */
 int tone_player_start_new(tone_type_e tone, sound_stream_info_h stream_info, int duration_ms, int *id);
 
-/* Note : Will be removed after migration to tone_player_start_new */
-int tone_player_start_with_stream_info(tone_type_e tone, sound_stream_info_h stream_info, int duration_ms, int *id);
-
 /**
  * @brief Stops playing the tone.
  *

diff --git a/packaging/capi-media-tone-player.spec b/packaging/capi-media-tone-player.spec
index 8d2b412ee519d3927569ca9b50cbd5795bb593e4..1f2a8ff120e0bf5c7351490f357930fea6716bb2 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.12
+Version:    0.1.14
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0

diff --git a/src/tone_player.c b/src/tone_player.c
index bca6f85ca180b242994b29464676fcc6f445e24f..75232c12a663a5becb8efd3be112d61a6bfba659 100755 (executable)
--- a/src/tone_player.c
+++ b/src/tone_player.c
@@ -59,7 +59,7 @@ 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, int *id)
+int tone_player_start(tone_type_e tone, sound_type_e type, int duration_ms, int *id)
 {
        int ret;
        int player;
@@ -69,7 +69,7 @@ int tone_player_start(tone_type_e tone, sound_type_e type, int duration, int *id
        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, &player);
+       ret = mm_sound_play_tone(tone, type , 1, duration_ms, &player);
 
        if (ret == 0 && id != NULL)
        *id = player;
@@ -77,7 +77,7 @@ int tone_player_start(tone_type_e tone, sound_type_e type, int duration, int *id
        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, int *id)
+int tone_player_start_new(tone_type_e tone, sound_stream_info_h stream_info, int duration_ms, int *id)
 {
        int ret;
        int player;
@@ -101,7 +101,7 @@ int tone_player_start_new(tone_type_e tone, sound_stream_info_h stream_info, int
        if (ret)
                return __convert_tone_player_error_code(__func__, ret);
 
-       ret = mm_sound_play_tone_with_stream_info(tone, stream_type, stream_id, vol, duration, &player);
+       ret = mm_sound_play_tone_with_stream_info(tone, stream_type, stream_id, vol, duration_ms, &player);
        if (ret == 0 && id != NULL)
                *id = player;