[v0.2.38] apply new naming according to the api naming change about audio policy

related commit
https://review.tizen.org/gerrit/#/c/101703/
https://review.tizen.org/gerrit/#/c/104678/

Change-Id: If47de5b953e43213632dc81ea168b4cd4f1754e3
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>
(cherry picked from commit d10a7074330df5a88e9bbe14bb0d00e329aba5b4)

diff --git a/legacy/include/legacy_player.h b/legacy/include/legacy_player.h
index e8bb0b791c52da4be3d589d23194e0de286e5206..4e647ecf1fdb70358f430bc4c4a01f0386b4729c 100644 (file)
--- a/legacy/include/legacy_player.h
+++ b/legacy/include/legacy_player.h
@@ -597,7 +597,7 @@ int legacy_player_set_volume(player_h player, float left, float right);
 int legacy_player_get_volume(player_h player, float *left, float *right);
 
 /**
- * @deprecated Deprecated since 3.0. Use legacy_player_set_audio_policy_info() instead.
+ * @deprecated Deprecated since 3.0. Use legacy_player_set_sound_stream_info() instead.
  * @brief Sets the player's volume type.
  * @since_tizen 2.3
  * @remarks The default sound type of the player is #SOUND_TYPE_MEDIA.
@@ -637,7 +637,7 @@ int legacy_player_set_sound_type(player_h player, sound_type_e type);
  * @see sound_manager_create_stream_information()
  * @see sound_manager_destroy_stream_information()
  */
-int legacy_player_set_audio_policy_info(player_h player, sound_stream_info_h stream_info);
+int legacy_player_set_sound_stream_info(player_h player, sound_stream_info_h stream_info);
 
 /**
  * @brief Sets the audio latency mode.

diff --git a/legacy/include/legacy_player_private.h b/legacy/include/legacy_player_private.h
index 40895bca8bed93f792054d38c5d1f1c3a00e2983..a022ac1e7e2f360e1e4b9310046b452aa20aaded 100644 (file)
--- a/legacy/include/legacy_player_private.h
+++ b/legacy/include/legacy_player_private.h
@@ -109,7 +109,7 @@ bool __player_state_validate(player_s * handle, player_state_e threshold);
 */
 int legacy_player_set_display_wl_for_mused(player_h player, player_display_type_e type, unsigned int wl_surface_id);
 int legacy_player_set_roi_area(player_h player, int x, int y, int w, int h);
-int legacy_player_set_audio_policy_info_for_mused(player_h player, char *stream_type, int stream_index);
+int legacy_player_set_sound_stream_info_for_mused(player_h player, char *stream_type, int stream_index);
 int legacy_player_sound_register(player_h player, int pid);
 int legacy_player_get_timeout_for_muse(player_h player, int *timeout);
 int legacy_player_get_num_of_video_out_buffers(player_h player, int *num, int *extra_num);

diff --git a/legacy/src/legacy_player.c b/legacy/src/legacy_player.c
index 854d4525f4d2848663a9dfcee80cfc65ba5d40d1..9ee6974242f43c0b5e0eca89d21c7edf26546b52 100644 (file)
--- a/legacy/src/legacy_player.c
+++ b/legacy/src/legacy_player.c
@@ -1518,7 +1518,7 @@ int legacy_player_set_sound_type(player_h player, sound_type_e type)
        return __player_convert_error_code(ret, (char *)__FUNCTION__);
 }
 #endif
-int legacy_player_set_audio_policy_info(player_h player, sound_stream_info_h stream_info)
+int legacy_player_set_sound_stream_info(player_h player, sound_stream_info_h stream_info)
 {
        PLAYER_INSTANCE_CHECK(player);
        player_s *handle = (player_s *)player;
@@ -3193,7 +3193,7 @@ int legacy_player_set_display_wl_for_mused(player_h player, player_display_type_
        }
 }
 
-int legacy_player_set_audio_policy_info_for_mused(player_h player, char *stream_type, int stream_index)
+int legacy_player_set_sound_stream_info_for_mused(player_h player, char *stream_type, int stream_index)
 {
        PLAYER_INSTANCE_CHECK(player);
        player_s *handle = (player_s *)player;

diff --git a/legacy/test/legacy_player_test.c b/legacy/test/legacy_player_test.c
index bc574791891a8d5ed21178df16d6ccb9d446ddcf..8074467d021323d78913c7df0811188cc17dcfea 100644 (file)
--- a/legacy/test/legacy_player_test.c
+++ b/legacy/test/legacy_player_test.c
@@ -948,7 +948,7 @@ static void set_sound_stream_info(int type)
                g_print("failed to create stream_information()\n");
                return;
        }
-       if (legacy_player_set_audio_policy_info(g_player[0], g_stream_info_h) != PLAYER_ERROR_NONE)
+       if (legacy_player_set_sound_stream_info(g_player[0], g_stream_info_h) != PLAYER_ERROR_NONE)
                g_print("failed to set sound stream information(%p)\n", g_stream_info_h);
        else
                g_print("set stream information(%p) success", g_stream_info_h);

diff --git a/muse/api.list b/muse/api.list
index d326b60109317c8554d6e6cc7e4489dcab3760b7..dd894501673b7d9a34f0603c5d869c8a40911af5 100644 (file)
--- a/muse/api.list
+++ b/muse/api.list
@@ -13,7 +13,7 @@ get_state
 set_volume
 get_volume
 set_sound_type
-set_audio_policy_info
+set_sound_stream_info
 set_audio_latency_mode
 get_audio_latency_mode
 set_play_position

diff --git a/muse/src/muse_player.c b/muse/src/muse_player.c
index 0a575068e71cdc82afd7135fca999f5e48b051e5..30483676a9ce01fffa2649c93f08f1f5fc5d724b 100644 (file)
--- a/muse/src/muse_player.c
+++ b/muse/src/muse_player.c
@@ -1361,10 +1361,10 @@ int player_disp_set_sound_type(muse_module_h module)
        return ret;
 }
 
-int player_disp_set_audio_policy_info(muse_module_h module)
+int player_disp_set_sound_stream_info(muse_module_h module)
 {
        int ret = PLAYER_ERROR_NONE;
-       muse_player_api_e api = MUSE_PLAYER_API_SET_AUDIO_POLICY_INFO;
+       muse_player_api_e api = MUSE_PLAYER_API_SET_SOUND_STREAM_INFO;
        muse_player_handle_s *muse_player = NULL;
        int stream_index = 0;
        char stream_type[MUSE_URI_MAX_LENGTH] = { 0, };
@@ -1373,7 +1373,7 @@ int player_disp_set_audio_policy_info(muse_module_h module)
        player_msg_get1_string(muse_core_client_get_msg(module), stream_index, INT, stream_type, ret_val);
        if (ret_val) {
                muse_player = (muse_player_handle_s *)muse_core_ipc_get_handle(module);
-               ret = legacy_player_set_audio_policy_info_for_mused(muse_player->player_handle, stream_type, stream_index);
+               ret = legacy_player_set_sound_stream_info_for_mused(muse_player->player_handle, stream_type, stream_index);
        } else {
                ret = PLAYER_ERROR_INVALID_OPERATION;
        }

diff --git a/packaging/mmsvc-player.spec b/packaging/mmsvc-player.spec
index 406b93f4400f107e4776f6484d1005614afd5560..6bcc1eea8eb82eae2f866eab878650ed6f652a23 100644 (file)
--- a/packaging/mmsvc-player.spec
+++ b/packaging/mmsvc-player.spec
@@ -1,6 +1,6 @@
 Name:       mmsvc-player
 Summary:    A Media Player module for muse server
-Version:    0.2.37
+Version:    0.2.38
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0