From: jiyong.min Date: Tue, 8 Oct 2019 05:13:28 +0000 (+0900) Subject: [UTC][capi-media-controller][Non-ACR][Rename inner functions] X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=50005ea0b7085e9ea9850a164db26ecb86d4fbfc;p=test%2Ftct%2Fnative%2Fapi.git [UTC][capi-media-controller][Non-ACR][Rename inner functions] - Rename foreach callbacks & utility functions to _mc_xxx - Rename server callbacks to _mc_server_xxx - Rename client callbacks to _mc_client_xxx Change-Id: I7c502d593d8cc85c5429d03cf464e89572dc1a1a --- diff --git a/src/utc/media-controller/utc-media-controller-common.c b/src/utc/media-controller/utc-media-controller-common.c index daafa8e4b..893a00549 100755 --- a/src/utc/media-controller/utc-media-controller-common.c +++ b/src/utc/media-controller/utc-media-controller-common.c @@ -282,7 +282,7 @@ void _mc_server_search_cmd_received_cb(const char *client_name, const char *requ signal_async(TRUE); } -void _mc_server_state_updated_cb(const char *server_name, mc_server_state_e state, void *user_data) +void _mc_client_server_state_updated_cb(const char *server_name, mc_server_state_e state, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -300,7 +300,7 @@ void _mc_server_state_updated_cb(const char *server_name, mc_server_state_e stat signal_async(TRUE); } -void _mc_playback_updated_cb(const char *server_name, mc_playback_h playback, void *user_data) +void _mc_client_playback_updated_cb(const char *server_name, mc_playback_h playback, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -376,7 +376,7 @@ void _mc_playback_updated_cb(const char *server_name, mc_playback_h playback, vo signal_async(TRUE); } -void _mc_metadata_updated_cb(const char *server_name, mc_metadata_h metadata, void *user_data) +void _mc_client_metadata_updated_cb(const char *server_name, mc_metadata_h metadata, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -418,7 +418,7 @@ void _mc_metadata_updated_cb(const char *server_name, mc_metadata_h metadata, vo signal_async(TRUE); } -void _mc_shuffle_mode_updated_cb(const char *server_name, mc_shuffle_mode_e mode, void *user_data) +void _mc_client_shuffle_mode_updated_cb(const char *server_name, mc_shuffle_mode_e mode, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -436,7 +436,7 @@ void _mc_shuffle_mode_updated_cb(const char *server_name, mc_shuffle_mode_e mode signal_async(TRUE); } -void _mc_bool_attribute_updated_cb(const char *server_name, bool enabled, void *user_data) +void _mc_client_bool_attribute_updated_cb(const char *server_name, bool enabled, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -454,7 +454,7 @@ void _mc_bool_attribute_updated_cb(const char *server_name, bool enabled, void * signal_async(TRUE); } -void _mc_display_mode_updated_cb(const char *server_name, mc_display_mode_e mode, void *user_data) +void _mc_client_display_mode_updated_cb(const char *server_name, mc_display_mode_e mode, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -472,7 +472,7 @@ void _mc_display_mode_updated_cb(const char *server_name, mc_display_mode_e mode signal_async(TRUE); } -void _mc_display_rotation_updated_cb(const char *server_name, mc_display_rotation_e rotation, void *user_data) +void _mc_client_display_rotation_updated_cb(const char *server_name, mc_display_rotation_e rotation, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -490,7 +490,7 @@ void _mc_display_rotation_updated_cb(const char *server_name, mc_display_rotatio signal_async(TRUE); } -void _mc_repeat_mode_changed_cb(const char *server_name, mc_repeat_mode_e mode, void *user_data) +void _mc_client_repeat_mode_updated_cb(const char *server_name, mc_repeat_mode_e mode, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -508,7 +508,7 @@ void _mc_repeat_mode_changed_cb(const char *server_name, mc_repeat_mode_e mode, signal_async(TRUE); } -void _mc_playback_ability_updated_cb(const char *server_name, mc_playback_ability_h ability, void *user_data) +void _mc_client_playback_ability_updated_cb(const char *server_name, mc_playback_ability_h ability, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); mc_ability_support_e supported = MC_ABILITY_SUPPORTED_UNDECIDED; @@ -534,7 +534,7 @@ void _mc_playback_ability_updated_cb(const char *server_name, mc_playback_abilit signal_async(TRUE); } -void _mc_shuffle_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data) +void _mc_client_shuffle_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -552,7 +552,7 @@ void _mc_shuffle_ability_updated_cb(const char *server_name, mc_ability_support_ signal_async(TRUE); } -void _mc_repeat_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data) +void _mc_client_repeat_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -570,7 +570,7 @@ void _mc_repeat_ability_updated_cb(const char *server_name, mc_ability_support_e signal_async(TRUE); } -void _mc_ability_updated_cb(const char *server_name, mc_ability_e ability, mc_ability_support_e support, void *user_data) +void _mc_client_ability_updated_cb(const char *server_name, mc_ability_e ability, mc_ability_support_e support, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -588,7 +588,7 @@ void _mc_ability_updated_cb(const char *server_name, mc_ability_e ability, mc_ab signal_async(TRUE); } -void _mc_playlist_updated_cb(const char *server_name, mc_playlist_update_mode_e mode, const char *playlist_name, mc_playlist_h playlist, void *user_data) +void _mc_client_playlist_updated_cb(const char *server_name, mc_playlist_update_mode_e mode, const char *playlist_name, mc_playlist_h playlist, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); int ret = MEDIA_CONTROLLER_ERROR_NONE; @@ -617,14 +617,14 @@ void _mc_playlist_updated_cb(const char *server_name, mc_playlist_update_mode_e return; } - ret = mc_playlist_foreach_item(playlist, _server_playlist_item_cb, &cb_result); + ret = mc_playlist_foreach_item(playlist, _mc_playlist_item_cb, &cb_result); if (ret != MEDIA_CONTROLLER_ERROR_NONE) FPRINTF("[%d:%s] fail mc_playlist_foreach_item [%d]\\n", __LINE__, __FUNCTION__, ret); signal_async(cb_result); } -void _mc_cmd_reply_received_cb(const char *server_name, const char *request_id, int result_code, bundle *data, void *user_data) +void _mc_client_cmd_reply_received_cb(const char *server_name, const char *request_id, int result_code, bundle *data, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -676,7 +676,7 @@ bool _mc_activated_client_cb(const char *client_name, void *user_data) return TRUE; } -void _mc_custom_event_received_cb(const char *server_name, const char *request_id, const char *event, bundle *data, void *user_data) +void _mc_client_custom_event_received_cb(const char *server_name, const char *request_id, const char *event, bundle *data, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -718,7 +718,7 @@ bool _mc_subscribed_server_cb(const char *server_name, void *user_data) return false; } -bool _mc_server_playlist_list_cb(mc_playlist_h playlist, void *user_data) +bool _mc_playlist_list_cb(mc_playlist_h playlist, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -763,7 +763,7 @@ bool _mc_search_condition_cb(mc_content_type_e content_type, mc_search_category_ return true; } -bool _server_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data) +bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -816,7 +816,7 @@ void _mc_server_enable_cmd_received_cb(const char *client_name, const char *requ signal_async(TRUE); } -void _display_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_display_mode_e display_mode, void *user_data) +void _mc_server_display_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_display_mode_e display_mode, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -834,7 +834,7 @@ void _display_mode_cmd_received_cb(const char *client_name, const char *request_ signal_async(TRUE); } -void _display_rotation_cmd_received_cb(const char *client_name, const char *request_id, mc_display_rotation_e display_rotation, void *user_data) +void _mc_server_display_rotation_cmd_received_cb(const char *client_name, const char *request_id, mc_display_rotation_e display_rotation, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -877,7 +877,7 @@ gboolean _mc_get_display_mode_ability(unsigned int supported_modes) return TRUE; } -void _mc_display_mode_ability_updated_cb(const char *server_name, unsigned int supported_modes, void *user_data) +void _mc_client_display_mode_ability_updated_cb(const char *server_name, unsigned int supported_modes, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); @@ -914,7 +914,7 @@ gboolean _mc_get_display_rotation_ability(unsigned int supported_rotations) return TRUE; } -void _mc_display_rotation_ability_updated_cb(const char *server_name, unsigned int supported_rotations, void *user_data) +void _mc_client_display_rotation_ability_updated_cb(const char *server_name, unsigned int supported_rotations, void *user_data) { FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__); diff --git a/src/utc/media-controller/utc-media-controller-common.h b/src/utc/media-controller/utc-media-controller-common.h index 699654934..2b1deadc0 100755 --- a/src/utc/media-controller/utc-media-controller-common.h +++ b/src/utc/media-controller/utc-media-controller-common.h @@ -108,34 +108,34 @@ void _mc_server_playlist_cmd_received_cb(const char* client_name, const char *re void _mc_server_custom_cmd_received_cb(const char* client_name, const char *request_id, const char *command, bundle *data, void *user_data); void _mc_server_event_reply_received_cb(const char *client_name, const char *request_id, int result_code, bundle *data, void *user_data); void _mc_server_search_cmd_received_cb(const char *client_name, const char *request_id, mc_search_h search, void *user_data); -void _mc_server_state_updated_cb(const char *server_name, mc_server_state_e state, void *user_data); -void _mc_playback_updated_cb(const char *server_name, mc_playback_h playback, void *user_data); -void _mc_metadata_updated_cb(const char *server_name, mc_metadata_h metadata, void *user_data); -void _mc_shuffle_mode_updated_cb(const char *server_name, mc_shuffle_mode_e mode, void *user_data); -void _mc_repeat_mode_changed_cb(const char *server_name, mc_repeat_mode_e mode, void *user_data); -void _mc_playback_ability_updated_cb(const char *server_name, mc_playback_ability_h ability, void *user_data); -void _mc_shuffle_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data); -void _mc_repeat_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data); -void _mc_ability_updated_cb(const char *server_name, mc_ability_e ability, mc_ability_support_e support, void *user_data); -void _mc_playlist_updated_cb(const char *server_name, mc_playlist_update_mode_e mode, const char *playlist_name, mc_playlist_h playlist, void *user_data); -void _mc_cmd_reply_received_cb(const char *server_name, const char *request_id, int result_code, bundle *data, void *user_data); +void _mc_client_server_state_updated_cb(const char *server_name, mc_server_state_e state, void *user_data); +void _mc_client_playback_updated_cb(const char *server_name, mc_playback_h playback, void *user_data); +void _mc_client_metadata_updated_cb(const char *server_name, mc_metadata_h metadata, void *user_data); +void _mc_client_shuffle_mode_updated_cb(const char *server_name, mc_shuffle_mode_e mode, void *user_data); +void _mc_client_repeat_mode_updated_cb(const char *server_name, mc_repeat_mode_e mode, void *user_data); +void _mc_client_playback_ability_updated_cb(const char *server_name, mc_playback_ability_h ability, void *user_data); +void _mc_client_shuffle_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data); +void _mc_client_repeat_ability_updated_cb(const char *server_name, mc_ability_support_e support, void *user_data); +void _mc_client_ability_updated_cb(const char *server_name, mc_ability_e ability, mc_ability_support_e support, void *user_data); +void _mc_client_playlist_updated_cb(const char *server_name, mc_playlist_update_mode_e mode, const char *playlist_name, mc_playlist_h playlist, void *user_data); +void _mc_client_cmd_reply_received_cb(const char *server_name, const char *request_id, int result_code, bundle *data, void *user_data); bool _mc_activated_server_cb(const char *server_name, void *user_data); bool _mc_activated_client_cb(const char *client_name, void *user_data); -void _mc_custom_event_received_cb(const char *server_name, const char *request_id, const char *event, bundle *data, void *user_data); +void _mc_client_custom_event_received_cb(const char *server_name, const char *request_id, const char *event, bundle *data, void *user_data); bool _mc_subscribed_server_cb(const char *server_name, void *user_data); -bool _mc_server_playlist_list_cb(mc_playlist_h playlist, void *user_data); +bool _mc_playlist_list_cb(mc_playlist_h playlist, void *user_data); bool _mc_search_condition_cb(mc_content_type_e content_type, mc_search_category_e category, const char *search_keyword, bundle *data, void *user_data); -bool _server_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data); -void _mc_bool_attribute_updated_cb(const char *server_name, bool enabled, void *user_data); -void _mc_display_mode_updated_cb(const char *server_name, mc_display_mode_e mode, void *user_data); -void _mc_display_rotation_updated_cb(const char *server_name, mc_display_rotation_e rotation, void *user_data); +bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data); +void _mc_client_bool_attribute_updated_cb(const char *server_name, bool enabled, void *user_data); +void _mc_client_display_mode_updated_cb(const char *server_name, mc_display_mode_e mode, void *user_data); +void _mc_client_display_rotation_updated_cb(const char *server_name, mc_display_rotation_e rotation, void *user_data); void _mc_server_enable_cmd_received_cb(const char *client_name, const char *request_id, bool enable, void *user_data); -void _display_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_display_mode_e display_mode, void *user_data); -void _display_rotation_cmd_received_cb(const char *client_name, const char *request_id, mc_display_rotation_e display_rotation, void *user_data); +void _mc_server_display_mode_cmd_received_cb(const char *client_name, const char *request_id, mc_display_mode_e display_mode, void *user_data); +void _mc_server_display_rotation_cmd_received_cb(const char *client_name, const char *request_id, mc_display_rotation_e display_rotation, void *user_data); gboolean _mc_get_display_mode_ability(unsigned int supported_modes); -void _mc_display_mode_ability_updated_cb(const char *server_name, unsigned int supported_modes, void *user_data); +void _mc_client_display_mode_ability_updated_cb(const char *server_name, unsigned int supported_modes, void *user_data); gboolean _mc_get_display_rotation_ability(unsigned int supported_rotations); -void _mc_display_rotation_ability_updated_cb(const char *server_name, unsigned int supported_rotations, void *user_data); +void _mc_client_display_rotation_ability_updated_cb(const char *server_name, unsigned int supported_rotations, void *user_data); //Add helper function declarations here diff --git a/src/utc/media-controller/utc-media-controller.c b/src/utc/media-controller/utc-media-controller.c index d47de21d8..39d792f4e 100755 --- a/src/utc/media-controller/utc-media-controller.c +++ b/src/utc/media-controller/utc-media-controller.c @@ -911,7 +911,7 @@ int utc_mc_server_update_playback_ability_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_ability_updated_cb(g_mc_client, _mc_playback_ability_updated_cb, NULL); + ret = mc_client_set_playback_ability_updated_cb(g_mc_client, _mc_client_playback_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_playback_ability(g_mc_server); @@ -949,7 +949,7 @@ int utc_mc_server_set_shuffle_ability_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, _mc_shuffle_ability_updated_cb, NULL); + ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, _mc_client_shuffle_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_shuffle_ability(g_mc_server, g_mc_test_ability); @@ -990,7 +990,7 @@ int utc_mc_server_set_repeat_ability_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, _mc_repeat_ability_updated_cb, NULL); + ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, _mc_client_repeat_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_repeat_ability(g_mc_server, g_mc_test_ability); @@ -1032,7 +1032,7 @@ int utc_mc_server_set_ability_support_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_ability_updated_cb, NULL); + ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_client_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); for (i = 0; i <= MC_ABILITY_SEARCH; i++) { @@ -1075,7 +1075,7 @@ int utc_mc_server_update_playback_info_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_playback_state(g_mc_server, g_mc_test_playback_state); @@ -1128,7 +1128,7 @@ int utc_mc_server_update_metadata_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_metadata_updated_cb, NULL); + ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_client_metadata_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = __mc_register_metadata(); @@ -1167,7 +1167,7 @@ int utc_mc_server_update_shuffle_mode_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_shuffle_mode_updated_cb, NULL); + ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_client_shuffle_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_shuffle_mode(g_mc_server, g_mc_test_shuffle_mode); @@ -1208,7 +1208,7 @@ int utc_mc_server_update_repeat_mode_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_repeat_mode_changed_cb, NULL); + ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_client_repeat_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_repeat_mode(g_mc_server, g_mc_test_repeat_mode); @@ -1249,7 +1249,7 @@ int utc_mc_server_update_subtitles_enabled_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_subtitles_enabled(g_mc_server, true); @@ -1287,7 +1287,7 @@ int utc_mc_server_update_360_mode_enabled_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_360_mode_enabled(g_mc_server, true); @@ -1325,7 +1325,7 @@ int utc_mc_server_update_display_mode_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_updated_cb(g_mc_client, _mc_display_mode_updated_cb, NULL); + ret = mc_client_set_display_mode_updated_cb(g_mc_client, _mc_client_display_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_display_mode(g_mc_server, MC_DISPLAY_MODE_FULL_SCREEN); @@ -1363,7 +1363,7 @@ int utc_mc_server_update_display_rotation_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_updated_cb(g_mc_client, _mc_display_rotation_updated_cb, NULL); + ret = mc_client_set_display_rotation_updated_cb(g_mc_client, _mc_client_display_rotation_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_update_display_rotation(g_mc_server, MC_DISPLAY_ROTATION_270); @@ -2012,7 +2012,7 @@ int utc_mc_server_set_display_mode_cmd_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _display_mode_cmd_received_cb, NULL); + ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _mc_server_display_mode_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -2046,7 +2046,7 @@ int utc_mc_server_unset_display_mode_cmd_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _display_mode_cmd_received_cb, NULL); + ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _mc_server_display_mode_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_unset_display_mode_cmd_received_cb(g_mc_server); @@ -2066,7 +2066,7 @@ int utc_mc_server_unset_display_mode_cmd_received_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _display_mode_cmd_received_cb, NULL); + ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _mc_server_display_mode_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_unset_display_mode_cmd_received_cb(NULL); @@ -2086,7 +2086,7 @@ int utc_mc_server_set_display_rotation_cmd_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _display_rotation_cmd_received_cb, NULL); + ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _mc_server_display_rotation_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -2120,7 +2120,7 @@ int utc_mc_server_unset_display_rotation_cmd_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _display_rotation_cmd_received_cb, NULL); + ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _mc_server_display_rotation_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_unset_display_rotation_cmd_received_cb(g_mc_server); @@ -2140,7 +2140,7 @@ int utc_mc_server_unset_display_rotation_cmd_received_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _display_rotation_cmd_received_cb, NULL); + ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _mc_server_display_rotation_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_unset_display_rotation_cmd_received_cb(NULL); @@ -2245,7 +2245,7 @@ int utc_mc_server_send_cmd_reply_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_cmd_reply_received_cb, &g_mc_reply_data); + ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_client_cmd_reply_received_cb, &g_mc_reply_data); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_custom_cmd_received_cb(g_mc_server, _mc_server_custom_cmd_received_cb, &g_mc_custom_data); @@ -2413,7 +2413,7 @@ int utc_mc_server_update_playlist_done_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; mc_playlist_h playlist = NULL; - ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_playlist_updated_cb, NULL); + ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_client_playlist_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_create_playlist(g_mc_server, g_mc_test_playlist_name, &playlist); @@ -2541,7 +2541,7 @@ int utc_mc_server_foreach_playlist_p(void) ret = __mc_register_playlist(&playlist); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_server_foreach_playlist(g_mc_server, _mc_server_playlist_list_cb, &cb_result); + ret = mc_server_foreach_playlist(g_mc_server, _mc_playlist_list_cb, &cb_result); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(cb_result, TRUE); @@ -2699,7 +2699,7 @@ int utc_mc_server_send_custom_event_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_custom_event_received_cb, NULL); + ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_client_custom_event_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_foreach_client(g_mc_server, _mc_activated_client_cb, &g_mc_client_name); @@ -2906,7 +2906,7 @@ int utc_mc_client_set_server_updated_cb_p(void) ret = mc_client_unset_server_updated_cb(g_mc_client); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_server_updated_cb(g_mc_client, _mc_server_state_updated_cb, NULL); + ret = mc_client_set_server_updated_cb(g_mc_client, _mc_client_server_state_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_destroy(g_mc_server); @@ -2931,7 +2931,7 @@ int utc_mc_client_set_server_updated_cb_n(void) ret = mc_client_unset_server_updated_cb(g_mc_client); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_server_updated_cb(NULL, _mc_server_state_updated_cb, NULL); + ret = mc_client_set_server_updated_cb(NULL, _mc_client_server_state_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_server_updated_cb(g_mc_client, NULL, NULL); @@ -2986,7 +2986,7 @@ int utc_mc_client_set_playback_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3004,7 +3004,7 @@ int utc_mc_client_set_playback_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_updated_cb(NULL, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(NULL, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_playback_updated_cb(g_mc_client, NULL, NULL); @@ -3059,7 +3059,7 @@ int utc_mc_client_set_metadata_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_metadata_updated_cb, NULL); + ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_client_metadata_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = __mc_register_metadata(); @@ -3081,7 +3081,7 @@ int utc_mc_client_set_metadata_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_metadata_updated_cb(NULL, _mc_metadata_updated_cb, NULL); + ret = mc_client_set_metadata_updated_cb(NULL, _mc_client_metadata_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_metadata_updated_cb(g_mc_client, NULL, NULL); @@ -3136,7 +3136,7 @@ int utc_mc_client_set_shuffle_mode_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_shuffle_mode_updated_cb, NULL); + ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_client_shuffle_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3154,7 +3154,7 @@ int utc_mc_client_set_shuffle_mode_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_mode_updated_cb(NULL, _mc_shuffle_mode_updated_cb, NULL); + ret = mc_client_set_shuffle_mode_updated_cb(NULL, _mc_client_shuffle_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, NULL, NULL); @@ -3209,7 +3209,7 @@ int utc_mc_client_set_repeat_mode_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_repeat_mode_changed_cb, NULL); + ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_client_repeat_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3227,7 +3227,7 @@ int utc_mc_client_set_repeat_mode_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_mode_updated_cb(NULL, _mc_repeat_mode_changed_cb, NULL); + ret = mc_client_set_repeat_mode_updated_cb(NULL, _mc_client_repeat_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, NULL, NULL); @@ -3282,7 +3282,7 @@ int utc_mc_client_set_playback_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_ability_updated_cb(g_mc_client, _mc_playback_ability_updated_cb, NULL); + ret = mc_client_set_playback_ability_updated_cb(g_mc_client, _mc_client_playback_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3300,7 +3300,7 @@ int utc_mc_client_set_playback_ability_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playback_ability_updated_cb(NULL, _mc_playback_ability_updated_cb, NULL); + ret = mc_client_set_playback_ability_updated_cb(NULL, _mc_client_playback_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_playback_ability_updated_cb(g_mc_client, NULL, NULL); @@ -3355,7 +3355,7 @@ int utc_mc_client_set_shuffle_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, _mc_shuffle_ability_updated_cb, NULL); + ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, _mc_client_shuffle_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3373,7 +3373,7 @@ int utc_mc_client_set_shuffle_ability_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_shuffle_ability_updated_cb(NULL, _mc_shuffle_ability_updated_cb, NULL); + ret = mc_client_set_shuffle_ability_updated_cb(NULL, _mc_client_shuffle_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_shuffle_ability_updated_cb(g_mc_client, NULL, NULL); @@ -3428,7 +3428,7 @@ int utc_mc_client_set_repeat_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, _mc_repeat_ability_updated_cb, NULL); + ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, _mc_client_repeat_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3445,7 +3445,7 @@ int utc_mc_client_set_repeat_ability_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_repeat_ability_updated_cb(NULL, _mc_repeat_ability_updated_cb, NULL); + ret = mc_client_set_repeat_ability_updated_cb(NULL, _mc_client_repeat_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_repeat_ability_updated_cb(g_mc_client, NULL, NULL); @@ -3500,7 +3500,7 @@ int utc_mc_client_set_ability_support_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_ability_updated_cb, NULL); + ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_client_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3517,7 +3517,7 @@ int utc_mc_client_set_ability_support_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_ability_support_updated_cb(NULL, _mc_ability_updated_cb, NULL); + ret = mc_client_set_ability_support_updated_cb(NULL, _mc_client_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_ability_support_updated_cb(g_mc_client, NULL, NULL); @@ -3572,7 +3572,7 @@ int utc_mc_client_set_display_mode_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_ability_updated_cb(g_mc_client, _mc_display_mode_ability_updated_cb, NULL); + ret = mc_client_set_display_mode_ability_updated_cb(g_mc_client, _mc_client_display_mode_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3589,7 +3589,7 @@ int utc_mc_client_set_display_mode_ability_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_ability_updated_cb(NULL, _mc_display_mode_ability_updated_cb, NULL); + ret = mc_client_set_display_mode_ability_updated_cb(NULL, _mc_client_display_mode_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_display_mode_ability_updated_cb(g_mc_client, NULL, NULL); @@ -3609,7 +3609,7 @@ int utc_mc_client_unset_display_mode_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_ability_updated_cb(g_mc_client, _mc_display_mode_ability_updated_cb, NULL); + ret = mc_client_set_display_mode_ability_updated_cb(g_mc_client, _mc_client_display_mode_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_ability_support_updated_cb(g_mc_client); @@ -3646,7 +3646,7 @@ int utc_mc_client_set_display_rotation_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_ability_updated_cb(g_mc_client, _mc_display_rotation_ability_updated_cb, NULL); + ret = mc_client_set_display_rotation_ability_updated_cb(g_mc_client, _mc_client_display_rotation_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3663,7 +3663,7 @@ int utc_mc_client_set_display_rotation_ability_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_ability_updated_cb(NULL, _mc_display_rotation_ability_updated_cb, NULL); + ret = mc_client_set_display_rotation_ability_updated_cb(NULL, _mc_client_display_rotation_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_display_rotation_ability_updated_cb(g_mc_client, NULL, NULL); @@ -3683,7 +3683,7 @@ int utc_mc_client_unset_display_rotation_ability_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_ability_updated_cb(g_mc_client, _mc_display_rotation_ability_updated_cb, NULL); + ret = mc_client_set_display_rotation_ability_updated_cb(g_mc_client, _mc_client_display_rotation_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_display_rotation_ability_updated_cb(g_mc_client); @@ -3720,7 +3720,7 @@ int utc_mc_client_set_playlist_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_playlist_updated_cb, NULL); + ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_client_playlist_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3794,7 +3794,7 @@ int utc_mc_client_set_cmd_reply_received_cb_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_cmd_reply_received_cb, &g_mc_reply_data); + ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_client_cmd_reply_received_cb, &g_mc_reply_data); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_custom_cmd_received_cb(g_mc_server, _mc_server_custom_cmd_received_cb, &g_mc_custom_data); @@ -3831,7 +3831,7 @@ int utc_mc_client_set_cmd_reply_received_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_cmd_reply_received_cb(NULL, _mc_cmd_reply_received_cb, NULL); + ret = mc_client_set_cmd_reply_received_cb(NULL, _mc_client_cmd_reply_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_cmd_reply_received_cb(g_mc_client, NULL, NULL); @@ -3851,7 +3851,7 @@ int utc_mc_client_unset_cmd_reply_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_cmd_reply_received_cb, NULL); + ret = mc_client_set_cmd_reply_received_cb(g_mc_client, _mc_client_cmd_reply_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_cmd_reply_received_cb(g_mc_client); @@ -3889,7 +3889,7 @@ int utc_mc_client_set_subtitles_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3906,7 +3906,7 @@ int utc_mc_client_set_subtitles_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_subtitles_updated_cb(NULL, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_subtitles_updated_cb(NULL, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_subtitles_updated_cb(g_mc_client, NULL, NULL); @@ -3926,7 +3926,7 @@ int utc_mc_client_unset_subtitles_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_subtitles_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_subtitles_updated_cb(g_mc_client); @@ -3963,7 +3963,7 @@ int utc_mc_client_set_360_mode_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -3980,7 +3980,7 @@ int utc_mc_client_set_360_mode_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_360_mode_updated_cb(NULL, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_360_mode_updated_cb(NULL, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_360_mode_updated_cb(g_mc_client, NULL, NULL); @@ -4000,7 +4000,7 @@ int utc_mc_client_unset_360_mode_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_bool_attribute_updated_cb, NULL); + ret = mc_client_set_360_mode_updated_cb(g_mc_client, _mc_client_bool_attribute_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_360_mode_updated_cb(g_mc_client); @@ -4037,7 +4037,7 @@ int utc_mc_client_set_display_mode_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_updated_cb(g_mc_client, _mc_display_mode_updated_cb, NULL); + ret = mc_client_set_display_mode_updated_cb(g_mc_client, _mc_client_display_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -4054,7 +4054,7 @@ int utc_mc_client_set_display_mode_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_mode_updated_cb(NULL, _mc_display_mode_updated_cb, NULL); + ret = mc_client_set_display_mode_updated_cb(NULL, _mc_client_display_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_display_mode_updated_cb(g_mc_client, NULL, NULL); @@ -4108,7 +4108,7 @@ int utc_mc_client_set_display_rotation_updated_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_updated_cb(g_mc_client, _mc_display_rotation_updated_cb, NULL); + ret = mc_client_set_display_rotation_updated_cb(g_mc_client, _mc_client_display_rotation_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); return 0; @@ -4125,7 +4125,7 @@ int utc_mc_client_set_display_rotation_updated_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_display_rotation_updated_cb(NULL, _mc_display_rotation_updated_cb, NULL); + ret = mc_client_set_display_rotation_updated_cb(NULL, _mc_client_display_rotation_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_display_rotation_updated_cb(g_mc_client, NULL, NULL); @@ -6045,7 +6045,7 @@ int utc_mc_client_send_display_mode_cmd_p(void) MC_DISPLAY_MODE_LETTER_BOX | MC_DISPLAY_MODE_ORIGIN_SIZE | MC_DISPLAY_MODE_FULL_SCREEN | MC_DISPLAY_MODE_CROPPED_FULL, g_mc_test_ability); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _display_mode_cmd_received_cb, NULL); + ret = mc_server_set_display_mode_cmd_received_cb(g_mc_server, _mc_server_display_mode_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); @@ -6103,7 +6103,7 @@ int utc_mc_client_send_display_rotation_cmd_p(void) MC_DISPLAY_ROTATION_NONE | MC_DISPLAY_ROTATION_90 | MC_DISPLAY_ROTATION_180 | MC_DISPLAY_ROTATION_270, g_mc_test_ability); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _display_rotation_cmd_received_cb, NULL); + ret = mc_server_set_display_rotation_cmd_received_cb(g_mc_server, _mc_server_display_rotation_cmd_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); @@ -6160,43 +6160,43 @@ int utc_mc_client_subscribe_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_metadata_updated_cb, NULL); + ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_client_metadata_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_METADATA, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_shuffle_mode_updated_cb, NULL); + ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_client_shuffle_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_SHUFFLE_MODE, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_repeat_mode_changed_cb, NULL); + ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_client_repeat_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_REPEAT_MODE, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_playlist_updated_cb, NULL); + ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_client_playlist_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYLIST, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_server_updated_cb(g_mc_client, _mc_server_state_updated_cb, NULL); + ret = mc_client_set_server_updated_cb(g_mc_client, _mc_client_server_state_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_SERVER_STATE, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_ability_updated_cb, NULL); + ret = mc_client_set_ability_support_updated_cb(g_mc_client, _mc_client_ability_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_ABILITY_SUPPORT, g_mc_server_name); @@ -6222,7 +6222,7 @@ int utc_mc_client_subscribe_n(void) ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(NULL, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); @@ -6251,7 +6251,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); @@ -6260,7 +6260,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_unsubscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_metadata_updated_cb, NULL); + ret = mc_client_set_metadata_updated_cb(g_mc_client, _mc_client_metadata_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_METADATA, g_mc_server_name); @@ -6269,7 +6269,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_unsubscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_METADATA, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_shuffle_mode_updated_cb, NULL); + ret = mc_client_set_shuffle_mode_updated_cb(g_mc_client, _mc_client_shuffle_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_SHUFFLE_MODE, g_mc_server_name); @@ -6278,7 +6278,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_unsubscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_SHUFFLE_MODE, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_repeat_mode_changed_cb, NULL); + ret = mc_client_set_repeat_mode_updated_cb(g_mc_client, _mc_client_repeat_mode_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_REPEAT_MODE, g_mc_server_name); @@ -6287,7 +6287,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_unsubscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_REPEAT_MODE, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_playlist_updated_cb, NULL); + ret = mc_client_set_playlist_updated_cb(g_mc_client, _mc_client_playlist_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYLIST, g_mc_server_name); @@ -6296,7 +6296,7 @@ int utc_mc_client_unsubscribe_p(void) ret = mc_client_unsubscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYLIST, g_mc_server_name); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_server_updated_cb(g_mc_client, _mc_server_state_updated_cb, NULL); + ret = mc_client_set_server_updated_cb(g_mc_client, _mc_client_server_state_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_SERVER_STATE, g_mc_server_name); @@ -6322,7 +6322,7 @@ int utc_mc_client_unsubscribe_n(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); @@ -6354,7 +6354,7 @@ int utc_mc_client_foreach_server_subscribed_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); @@ -6381,7 +6381,7 @@ int utc_mc_client_foreach_server_subscribed_n(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_playback_updated_cb, NULL); + ret = mc_client_set_playback_updated_cb(g_mc_client, _mc_client_playback_updated_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_subscribe(g_mc_client, MC_SUBSCRIPTION_TYPE_PLAYBACK, g_mc_server_name); @@ -6415,7 +6415,7 @@ int utc_mc_client_foreach_server_playlist_p(void) ret = mc_client_get_latest_server_info(g_mc_client, &g_mc_server_name, &g_mc_server_state); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_client_foreach_server_playlist(g_mc_client, g_mc_server_name, _mc_server_playlist_list_cb, &cb_result); + ret = mc_client_foreach_server_playlist(g_mc_client, g_mc_server_name, _mc_playlist_list_cb, &cb_result); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(cb_result, TRUE); @@ -6457,7 +6457,7 @@ int utc_mc_client_set_custom_event_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_custom_event_received_cb, NULL); + ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_client_custom_event_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_custom_event_received_cb(g_mc_client); @@ -6477,7 +6477,7 @@ int utc_mc_client_set_custom_event_received_cb_n(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_custom_event_received_cb(NULL, _mc_custom_event_received_cb, NULL); + ret = mc_client_set_custom_event_received_cb(NULL, _mc_client_custom_event_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_INVALID_PARAMETER); ret = mc_client_set_custom_event_received_cb(g_mc_client, NULL, NULL); @@ -6497,7 +6497,7 @@ int utc_mc_client_unset_custom_event_received_cb_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_custom_event_received_cb, NULL); + ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_client_custom_event_received_cb, NULL); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_client_unset_custom_event_received_cb(g_mc_client); @@ -6534,7 +6534,7 @@ int utc_mc_client_send_event_reply_p(void) int ret = MEDIA_CONTROLLER_ERROR_NONE; - ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_custom_event_received_cb, &g_mc_custom_data); + ret = mc_client_set_custom_event_received_cb(g_mc_client, _mc_client_custom_event_received_cb, &g_mc_custom_data); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); ret = mc_server_set_event_reply_received_cb(g_mc_server, _mc_server_event_reply_received_cb, &g_mc_reply_data); @@ -6718,7 +6718,7 @@ int utc_mc_playlist_foreach_playlist_p(void) ret = __mc_register_playlist(&playlist); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_playlist_foreach_playlist(g_mc_server_name, _mc_server_playlist_list_cb, &cb_result); + ret = mc_playlist_foreach_playlist(g_mc_server_name, _mc_playlist_list_cb, &cb_result); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(cb_result, TRUE); @@ -6822,7 +6822,7 @@ int utc_mc_playlist_foreach_item_p(void) ret = __mc_register_playlist(&playlist); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); - ret = mc_playlist_foreach_item(playlist, _server_playlist_item_cb, &cb_result); + ret = mc_playlist_foreach_item(playlist, _mc_playlist_item_cb, &cb_result); assert_eq(ret, MEDIA_CONTROLLER_ERROR_NONE); assert_eq(cb_result, TRUE);