From: Eunhae Choi <eunhae1.choi@samsung.com>
Date: Wed, 14 Dec 2016 05:49:24 +0000 (+0900)
Subject: [v0.3.38] apply new naming about player_set_audio_policy_info()
X-Git-Tag: submit/tizen_3.0/20161220.100802~3
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0a860a08cc053f980ee185288e231573ebde6f19;p=platform%2Fcore%2Fapi%2Fplayer.git

[v0.3.38] apply new naming about player_set_audio_policy_info()

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

Change-Id: Idd5f239b869886ee220c9e4ebaf92dd40d069672
Signed-off-by: Eunhae Choi <eunhae1.choi@samsung.com>
---

diff --git a/doc/player_doc.h b/doc/player_doc.h
index 684006c..7b144f0 100755
--- a/doc/player_doc.h
+++ b/doc/player_doc.h
@@ -190,7 +190,7 @@
  *    <td>This function must be called after player_create()</td>
  * </tr>
  * <tr>
- *    <td>player_set_audio_policy_info()</td>
+ *    <td>player_set_sound_stream_info()</td>
  *    <td>IDLE</td>
  *    <td>This function must be called after player_create()</td>
  * </tr>
diff --git a/include/common/player.h b/include/common/player.h
index 12ac356..af45268 100644
--- a/include/common/player.h
+++ b/include/common/player.h
@@ -606,7 +606,7 @@ int player_set_volume(player_h player, float left, float right);
 int player_get_volume(player_h player, float *left, float *right);
 
 /**
- * @deprecated Deprecated since 3.0. Use player_set_audio_policy_info() instead.
+ * @deprecated Deprecated since 3.0. Use 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.
diff --git a/include/wearable/player.h b/include/wearable/player.h
index 42c7073..5b8bf55 100644
--- a/include/wearable/player.h
+++ b/include/wearable/player.h
@@ -607,7 +607,7 @@ int player_set_volume(player_h player, float left, float right);
 int player_get_volume(player_h player, float *left, float *right);
 
 /**
- * @deprecated Deprecated since 3.0. Use player_set_audio_policy_info() instead.
+ * @deprecated Deprecated since 3.0. Use player_set_sound_stream_info() instead.
  * @brief Sets the player's volume type.
  * @since_tizen 2.3.1
  * @remarks The default sound type of the player is #SOUND_TYPE_MEDIA.
diff --git a/packaging/capi-media-player.spec b/packaging/capi-media-player.spec
index 6c723d9..ba38cd3 100644
--- a/packaging/capi-media-player.spec
+++ b/packaging/capi-media-player.spec
@@ -1,6 +1,6 @@
 Name:       capi-media-player
 Summary:    A Media Player API
-Version:    0.3.37
+Version:    0.3.38
 Release:    0
 Group:      Multimedia/API
 License:    Apache-2.0
diff --git a/src/player.c b/src/player.c
index 785b6d4..4e589cf 100644
--- a/src/player.c
+++ b/src/player.c
@@ -2050,7 +2050,7 @@ int player_set_sound_type(player_h player, sound_type_e type)
 	char *ret_buf = NULL;
 
 	LOGD("ENTER");
-	LOGW("DEPRECATION WARNING: player_set_sound_type() is deprecated and will be removed from next release. Use player_set_audio_policy_info() instead.");
+	LOGW("DEPRECATION WARNING: player_set_sound_type() is deprecated and will be removed from next release. Use player_set_sound_stream_info() instead.");
 
 	player_msg_send1(api, pc, ret_buf, ret, INT, type);
 	g_free(ret_buf);
@@ -2061,7 +2061,7 @@ int player_set_audio_policy_info(player_h player, sound_stream_info_h stream_inf
 {
 	PLAYER_INSTANCE_CHECK(player);
 
-	muse_player_api_e api = MUSE_PLAYER_API_SET_AUDIO_POLICY_INFO;
+	muse_player_api_e api = MUSE_PLAYER_API_SET_SOUND_STREAM_INFO;
 	player_cli_s *pc = (player_cli_s *) player;
 	char *ret_buf = NULL;
 
@@ -2098,7 +2098,7 @@ int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_inf
 {
 	PLAYER_INSTANCE_CHECK(player);
 
-	muse_player_api_e api = MUSE_PLAYER_API_SET_AUDIO_POLICY_INFO;
+	muse_player_api_e api = MUSE_PLAYER_API_SET_SOUND_STREAM_INFO;
 	player_cli_s *pc = (player_cli_s *) player;
 	char *ret_buf = NULL;
 
@@ -2112,9 +2112,9 @@ int player_set_sound_stream_info(player_h player, sound_stream_info_h stream_inf
 					stream_info, NATIVE_API_PLAYER, &is_available), (char *)__FUNCTION__);
 
 	if (ret == PLAYER_ERROR_NONE) {
-		if (is_available == false)
+		if (is_available == false) {
 			ret = PLAYER_ERROR_FEATURE_NOT_SUPPORTED_ON_DEVICE;
-		else {
+		} else {
 			char *stream_type = NULL;
 			int stream_index = 0;
 			ret = sound_manager_get_type_from_stream_information(stream_info, &stream_type);
diff --git a/test/player_test.c b/test/player_test.c
index 6bd644a..f471a21 100644
--- a/test/player_test.c
+++ b/test/player_test.c
@@ -1302,7 +1302,7 @@ static void set_sound_stream_info(int type)
 		}
 	}
 
-	if (player_set_audio_policy_info(g_player[0], g_stream_info_h) != PLAYER_ERROR_NONE)
+	if (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);