From 8a1388322ae4b4e6130e0be23f4bf3fece5934d7 Mon Sep 17 00:00:00 2001 From: hj kim Date: Wed, 14 Aug 2019 10:48:34 +0900 Subject: [PATCH] Change mc_client_get_ability_support() to mc_client_get_server_ability_support() Change-Id: Ifce4e6ec68fcdc4b7a648afc8a4c3b5f366d5f3b --- include/media_controller_client.h | 6 +++--- src/media_controller_client.c | 6 +++--- test/client_test/media_controller_client_test.c | 12 ++++++------ 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/include/media_controller_client.h b/include/media_controller_client.h index 15dd1f2..f7bdffb 100644 --- a/include/media_controller_client.h +++ b/include/media_controller_client.h @@ -1373,7 +1373,7 @@ int mc_client_get_server_icon(mc_client_h client, const char *server_name, char int mc_client_get_server_playback_ability(mc_client_h client, const char *server_name, mc_playback_ability_h *ability); /** - * @deprecated Deprecated since 5.5. Use mc_client_get_ability_support() instead. + * @deprecated Deprecated since 5.5. Use mc_client_get_server_ability_support() instead. * @brief Gets the support value of the shuffle ability of the updated media controller server. * @since_tizen 5.0 * @@ -1404,7 +1404,7 @@ int mc_client_get_server_playback_ability(mc_client_h client, const char *server int mc_client_get_server_shuffle_ability_support(mc_client_h client, const char *server_name, mc_ability_support_e *support) TIZEN_DEPRECATED_API; /** - * @deprecated Deprecated since 5.5. Use mc_client_get_ability_support() instead. + * @deprecated Deprecated since 5.5. Use mc_client_get_server_ability_support() instead. * @brief Gets the support value of the repeat ability of the updated media controller server. * @since_tizen 5.0 * @@ -1464,7 +1464,7 @@ int mc_client_get_server_repeat_ability_support(mc_client_h client, const char * * @see mc_client_get_latest_server_info() * @see mc_client_foreach_server() */ -int mc_client_get_ability_support(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support); +int mc_client_get_server_ability_support(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support); /** * @brief Retrieves all created servers. diff --git a/src/media_controller_client.c b/src/media_controller_client.c index 4fbbc75..e3ab171 100644 --- a/src/media_controller_client.c +++ b/src/media_controller_client.c @@ -1393,19 +1393,19 @@ static int __mc_client_get_server_ability(mc_client_h client, const char *server int mc_client_get_server_shuffle_ability_support(mc_client_h client, const char *server_name, mc_ability_support_e *support) { - mc_warning("DEPRECATION WARNING: mc_client_get_server_shuffle_ability_support() is removed from 5.5. Use mc_client_get_ability_support() instead."); + mc_warning("DEPRECATION WARNING: mc_client_get_server_shuffle_ability_support() is removed from 5.5. Use mc_client_get_server_ability_support() instead."); return __mc_client_get_server_ability(client, server_name, MC_ABILITY_SHUFFLE, support); } int mc_client_get_server_repeat_ability_support(mc_client_h client, const char *server_name, mc_ability_support_e *support) { - mc_warning("DEPRECATION WARNING: mc_client_get_server_repeat_ability_support() is removed from 5.5. Use mc_client_get_ability_support() instead."); + mc_warning("DEPRECATION WARNING: mc_client_get_server_repeat_ability_support() is removed from 5.5. Use mc_client_get_server_ability_support() instead."); return __mc_client_get_server_ability(client, server_name, MC_ABILITY_REPEAT, support); } -int mc_client_get_ability_support(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support) +int mc_client_get_server_ability_support(mc_client_h client, const char *server_name, mc_ability_e ability, mc_ability_support_e *support) { return __mc_client_get_server_ability(client, server_name, ability, support); } diff --git a/test/client_test/media_controller_client_test.c b/test/client_test/media_controller_client_test.c index 305ef94..92df4a2 100755 --- a/test/client_test/media_controller_client_test.c +++ b/test/client_test/media_controller_client_test.c @@ -601,32 +601,32 @@ static gboolean _get_info(int type) ret = mc_playback_ability_destroy(ability); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to mc_playback_ability_destroy [%d]", ret); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_SHUFFLE, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_SHUFFLE, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get shuffle ability [%d]", ret); g_print("shuffle_ability: %d \n", support); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_REPEAT, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_REPEAT, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get repeat ability [%d]", ret); g_print("repeat_ability: %d \n", support); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_PLAYBACK_POSITION, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_PLAYBACK_POSITION, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get playback position ability [%d]", ret); g_print("position_ability: %d \n", support); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_PLAYLIST, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_PLAYLIST, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get playlist ability [%d]", ret); g_print("playlist_ability: %d \n", support); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_CLIENT_CUSTOM, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_CLIENT_CUSTOM, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get client custom ability [%d]", ret); g_print("custom_ability: %d \n", support); - ret = mc_client_get_ability_support(g_mc_client, g_server_name, MC_ABILITY_SEARCH, &support); + ret = mc_client_get_server_ability_support(g_mc_client, g_server_name, MC_ABILITY_SEARCH, &support); mc_retvm_if(ret != MEDIA_CONTROLLER_ERROR_NONE, FALSE, "Fail to get search ability [%d]", ret); g_print("search_ability: %d \n", support); -- 2.7.4