[UTC][capi-media-controller][Non-ACR][Relocate inner functions]

 - Relocated utility and callback functions

Change-Id: I1e961761a3c366afd3f248437d5f242d35fd1991

diff --git a/src/utc/media-controller/utc-media-controller-common.c b/src/utc/media-controller/utc-media-controller-common.c
index 893a00549d487fd00782f93073e2709ec80800fa..ae28a4eb2d7f5856e5ae1d47d6f8348c54d3c72a 100755 (executable)
--- a/src/utc/media-controller/utc-media-controller-common.c
+++ b/src/utc/media-controller/utc-media-controller-common.c
@@ -61,6 +61,182 @@ gboolean wait_for_async()
        return g_async_result;
 }
 
+gboolean _mc_get_display_mode_ability(unsigned int supported_modes)
+{
+       if (!(supported_modes & MC_DISPLAY_MODE_LETTER_BOX)) {
+               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_LETTER_BOX);
+               return FALSE;
+       }
+
+       if (!(supported_modes & MC_DISPLAY_MODE_ORIGIN_SIZE)) {
+               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_ORIGIN_SIZE);
+               return FALSE;
+       }
+
+       if (!(supported_modes & MC_DISPLAY_MODE_FULL_SCREEN)) {
+               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_FULL_SCREEN);
+               return FALSE;
+       }
+
+       if (!(supported_modes & MC_DISPLAY_MODE_CROPPED_FULL)) {
+               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_CROPPED_FULL);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+gboolean _mc_get_display_rotation_ability(unsigned int supported_rotations)
+{
+       if (!(supported_rotations & MC_DISPLAY_ROTATION_NONE)) {
+               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_NONE);
+               return FALSE;
+       }
+
+       if (!(supported_rotations & MC_DISPLAY_ROTATION_90)) {
+               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_90);
+               return FALSE;
+       }
+
+       if (!(supported_rotations & MC_DISPLAY_ROTATION_180)) {
+               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_180);
+               return FALSE;
+       }
+
+       if (!(supported_rotations & MC_DISPLAY_ROTATION_270)) {
+               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_270);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+
+//Add foreach callback function declarations here
+bool _mc_activated_server_cb(const char *server_name, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+       char **get_name = (char **)user_data;
+
+       if(strcmp(server_name, g_mc_test_appname) == 0) {
+               if(get_name != NULL)
+                       *get_name = g_strdup(server_name);
+
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+bool _mc_activated_client_cb(const char *client_name, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+       char **get_name = (char **)user_data;
+
+       if(strcmp(client_name, g_mc_test_appname) == 0) {
+               if(get_name != NULL)
+                       *get_name = g_strdup(client_name);
+
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
+bool _mc_subscribed_server_cb(const char *server_name, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+       char **get_name = (char **)user_data;
+
+       if(strcmp(server_name, g_mc_test_appname) == 0) {
+               if (get_name != NULL)
+                       *get_name = g_strdup(server_name);
+               return false;
+       }
+
+    return false;
+}
+
+bool _mc_playlist_list_cb(mc_playlist_h playlist, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+
+       int ret = MEDIA_CONTROLLER_ERROR_NONE;
+       char *playlist_name = NULL;
+       gboolean *result = (gboolean *)user_data;
+
+       ret = mc_playlist_get_name(playlist, &playlist_name);
+       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+               FPRINTF("[%d:%s] fail mc_playlist_get_name [%d]\\n", __LINE__, __FUNCTION__, ret);
+
+       if(g_strcmp0(playlist_name, g_mc_test_playlist_name)) {
+               FPRINTF("[%d:%s] wrong playlist name [%s][%s]\\n", __LINE__, __FUNCTION__, playlist_name, g_mc_test_playlist_name);
+               free(playlist_name);
+               *result = FALSE;
+               return false;
+       }
+
+       *result = TRUE;
+
+       return true;
+}
+
+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)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+
+       gboolean *result = (gboolean *)user_data;
+
+       if (content_type != g_mc_test_content_type) {
+               FPRINTF("[%d:%s] wrong content type [%d][%d]\\n", __LINE__, __FUNCTION__, content_type, g_mc_test_content_type);
+               return false;
+       }
+
+       if (g_strcmp0(search_keyword, g_mc_test_keywords[category])) {
+               FPRINTF("[%d:%s] wrong search keyword [%s][%s]\\n", __LINE__, __FUNCTION__, search_keyword, g_mc_test_keywords[category]);
+               *result = FALSE;
+               return false;
+       }
+
+       *result = TRUE;
+       return true;
+}
+
+bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+
+       int ret = MEDIA_CONTROLLER_ERROR_NONE;
+       char *value = NULL;
+       gboolean *result = (gboolean *)user_data;
+
+       if (index != NULL) {
+               if(strcmp(index, g_mc_test_playlist_idx)) {
+                       FPRINTF("[%d:%s] wrong playlist index. expect [%s] but [%s]\\n", __LINE__, __FUNCTION__, g_mc_test_playlist_idx, index);
+                       return FALSE;
+               }
+
+               ret = mc_metadata_get(meta, MC_META_MEDIA_TITLE, &value);
+               if (ret != MEDIA_CONTROLLER_ERROR_NONE)
+                       FPRINTF("[%d:%s] fail mc_metadata_get [%d]\\n", __LINE__, __FUNCTION__, ret);
+
+               if (value != NULL) {
+                       if(strcmp(value, g_mc_test_playlist_metadata[0])) {
+                               FPRINTF("[%d:%s] fail mc_metadata_get [%s]\\n", __LINE__, __FUNCTION__, value);
+                               free(value);
+                               return FALSE;
+                       }
+                       free(value);
+                       *result = TRUE;
+               }
+       } else {
+               FPRINTF("[%d:%s] wrong index\\n", __LINE__, __FUNCTION__);
+               return FALSE;
+       }
+
+       return TRUE;
+}
+
 
 //Add callback function declarations here
 void _mc_server_playback_position_cmd_received_cb(const char* client_name, const char *request_id, unsigned long long position, void *user_data)
@@ -282,6 +458,60 @@ void _mc_server_search_cmd_received_cb(const char *client_name, const char *requ
        signal_async(TRUE);
 }
 
+void _mc_server_enable_cmd_received_cb(const char *client_name, const char *request_id, bool enable, void *user_data)
+{
+       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
+
+       if (strcmp(client_name, g_mc_test_appname)) {
+               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
+               return;
+       }
+
+       if (enable != true) {
+               FPRINTF("[%d:%s] enable is not true\\n", __LINE__, __FUNCTION__);
+               signal_async(FALSE);
+               return;
+       }
+
+       signal_async(TRUE);
+}
+
+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__);
+
+       if (strcmp(client_name, g_mc_test_appname)) {
+               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
+               return;
+       }
+
+       if (display_mode != MC_DISPLAY_MODE_FULL_SCREEN) {
+               FPRINTF("[%d:%s] wrong display mode [%d][%d]\\n", __LINE__, __FUNCTION__, display_mode, MC_DISPLAY_MODE_FULL_SCREEN);
+               signal_async(FALSE);
+               return;
+       }
+
+       signal_async(TRUE);
+}
+
+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__);
+
+       if (strcmp(client_name, g_mc_test_appname)) {
+               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
+               return;
+       }
+
+       if (display_rotation != MC_DISPLAY_ROTATION_270) {
+               FPRINTF("[%d:%s] wrong display mode [%d][%d]\\n", __LINE__, __FUNCTION__, display_rotation, MC_DISPLAY_ROTATION_270);
+               signal_async(FALSE);
+               return;
+       }
+
+       signal_async(TRUE);
+}
+
 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__);
@@ -646,36 +876,6 @@ void _mc_client_cmd_reply_received_cb(const char *server_name, const char *reque
        signal_async(TRUE);
 }
 
-bool _mc_activated_server_cb(const char *server_name, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-       char **get_name = (char **)user_data;
-
-       if(strcmp(server_name, g_mc_test_appname) == 0) {
-               if(get_name != NULL)
-                       *get_name = g_strdup(server_name);
-
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
-bool _mc_activated_client_cb(const char *client_name, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-       char **get_name = (char **)user_data;
-
-       if(strcmp(client_name, g_mc_test_appname) == 0) {
-               if(get_name != NULL)
-                       *get_name = g_strdup(client_name);
-
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
 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__);
@@ -704,179 +904,6 @@ void _mc_client_custom_event_received_cb(const char *server_name, const char *re
        signal_async(TRUE);
 }
 
-bool _mc_subscribed_server_cb(const char *server_name, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-       char **get_name = (char **)user_data;
-
-       if(strcmp(server_name, g_mc_test_appname) == 0) {
-               if (get_name != NULL)
-                       *get_name = g_strdup(server_name);
-               return false;
-       }
-
-    return false;
-}
-
-bool _mc_playlist_list_cb(mc_playlist_h playlist, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
-       char *playlist_name = NULL;
-       gboolean *result = (gboolean *)user_data;
-
-       ret = mc_playlist_get_name(playlist, &playlist_name);
-       if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-               FPRINTF("[%d:%s] fail mc_playlist_get_name [%d]\\n", __LINE__, __FUNCTION__, ret);
-
-       if(g_strcmp0(playlist_name, g_mc_test_playlist_name)) {
-               FPRINTF("[%d:%s] wrong playlist name [%s][%s]\\n", __LINE__, __FUNCTION__, playlist_name, g_mc_test_playlist_name);
-               free(playlist_name);
-               *result = FALSE;
-               return false;
-       }
-
-       *result = TRUE;
-
-       return true;
-}
-
-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)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-
-       gboolean *result = (gboolean *)user_data;
-
-       if (content_type != g_mc_test_content_type) {
-               FPRINTF("[%d:%s] wrong content type [%d][%d]\\n", __LINE__, __FUNCTION__, content_type, g_mc_test_content_type);
-               return false;
-       }
-
-       if (g_strcmp0(search_keyword, g_mc_test_keywords[category])) {
-               FPRINTF("[%d:%s] wrong search keyword [%s][%s]\\n", __LINE__, __FUNCTION__, search_keyword, g_mc_test_keywords[category]);
-               *result = FALSE;
-               return false;
-       }
-
-       *result = TRUE;
-       return true;
-}
-
-bool _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-
-       int ret = MEDIA_CONTROLLER_ERROR_NONE;
-       char *value = NULL;
-       gboolean *result = (gboolean *)user_data;
-
-       if (index != NULL) {
-               if(strcmp(index, g_mc_test_playlist_idx)) {
-                       FPRINTF("[%d:%s] wrong playlist index. expect [%s] but [%s]\\n", __LINE__, __FUNCTION__, g_mc_test_playlist_idx, index);
-                       return FALSE;
-               }
-
-               ret = mc_metadata_get(meta, MC_META_MEDIA_TITLE, &value);
-               if (ret != MEDIA_CONTROLLER_ERROR_NONE)
-                       FPRINTF("[%d:%s] fail mc_metadata_get [%d]\\n", __LINE__, __FUNCTION__, ret);
-
-               if (value != NULL) {
-                       if(strcmp(value, g_mc_test_playlist_metadata[0])) {
-                               FPRINTF("[%d:%s] fail mc_metadata_get [%s]\\n", __LINE__, __FUNCTION__, value);
-                               free(value);
-                               return FALSE;
-                       }
-                       free(value);
-                       *result = TRUE;
-               }
-       } else {
-               FPRINTF("[%d:%s] wrong index\\n", __LINE__, __FUNCTION__);
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
-void _mc_server_enable_cmd_received_cb(const char *client_name, const char *request_id, bool enable, void *user_data)
-{
-       FPRINTF("[%d:%s] invoked\\n", __LINE__, __FUNCTION__);
-
-       if (strcmp(client_name, g_mc_test_appname)) {
-               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
-               return;
-       }
-
-       if (enable != true) {
-               FPRINTF("[%d:%s] enable is not true\\n", __LINE__, __FUNCTION__);
-               signal_async(FALSE);
-               return;
-       }
-
-       signal_async(TRUE);
-}
-
-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__);
-
-       if (strcmp(client_name, g_mc_test_appname)) {
-               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
-               return;
-       }
-
-       if (display_mode != MC_DISPLAY_MODE_FULL_SCREEN) {
-               FPRINTF("[%d:%s] wrong display mode [%d][%d]\\n", __LINE__, __FUNCTION__, display_mode, MC_DISPLAY_MODE_FULL_SCREEN);
-               signal_async(FALSE);
-               return;
-       }
-
-       signal_async(TRUE);
-}
-
-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__);
-
-       if (strcmp(client_name, g_mc_test_appname)) {
-               FPRINTF("[%d:%s] wrong client name [%s][%s]\\n", __LINE__, __FUNCTION__, client_name, g_mc_test_appname);
-               return;
-       }
-
-       if (display_rotation != MC_DISPLAY_ROTATION_270) {
-               FPRINTF("[%d:%s] wrong display mode [%d][%d]\\n", __LINE__, __FUNCTION__, display_rotation, MC_DISPLAY_ROTATION_270);
-               signal_async(FALSE);
-               return;
-       }
-
-       signal_async(TRUE);
-}
-
-gboolean _mc_get_display_mode_ability(unsigned int supported_modes)
-{
-       if (!(supported_modes & MC_DISPLAY_MODE_LETTER_BOX)) {
-               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_LETTER_BOX);
-               return FALSE;
-       }
-
-       if (!(supported_modes & MC_DISPLAY_MODE_ORIGIN_SIZE)) {
-               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_ORIGIN_SIZE);
-               return FALSE;
-       }
-
-       if (!(supported_modes & MC_DISPLAY_MODE_FULL_SCREEN)) {
-               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_FULL_SCREEN);
-               return FALSE;
-       }
-
-       if (!(supported_modes & MC_DISPLAY_MODE_CROPPED_FULL)) {
-               FPRINTF("[%d:%s] wrong supported mode [%d][%d]\\n", __LINE__, __FUNCTION__, supported_modes, MC_DISPLAY_MODE_CROPPED_FULL);
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
 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__);
@@ -889,31 +916,6 @@ void _mc_client_display_mode_ability_updated_cb(const char *server_name, unsigne
        signal_async(_mc_get_display_mode_ability(supported_modes));
 }
 
-gboolean _mc_get_display_rotation_ability(unsigned int supported_rotations)
-{
-       if (!(supported_rotations & MC_DISPLAY_ROTATION_NONE)) {
-               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_NONE);
-               return FALSE;
-       }
-
-       if (!(supported_rotations & MC_DISPLAY_ROTATION_90)) {
-               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_90);
-               return FALSE;
-       }
-
-       if (!(supported_rotations & MC_DISPLAY_ROTATION_180)) {
-               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_180);
-               return FALSE;
-       }
-
-       if (!(supported_rotations & MC_DISPLAY_ROTATION_270)) {
-               FPRINTF("[%d:%s] wrong supported rotation [%d][%d]\\n", __LINE__, __FUNCTION__, supported_rotations, MC_DISPLAY_ROTATION_270);
-               return FALSE;
-       }
-
-       return TRUE;
-}
-
 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 2b1deadc03b1c291cc1964c567e6f9395c43c33b..071ea987cf9b633e6b353c9b00f51b5473bdc98c 100755 (executable)
--- a/src/utc/media-controller/utc-media-controller-common.h
+++ b/src/utc/media-controller/utc-media-controller-common.h
@@ -99,6 +99,14 @@ static const char *g_mc_test_keywords[] = {
        "test_time_place_occasion",
 };
 
+//Add foreach callback function declarations here
+bool _mc_activated_server_cb(const char *server_name, void *user_data);
+bool _mc_activated_client_cb(const char *client_name, void *user_data);
+bool _mc_subscribed_server_cb(const char *server_name, 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 _mc_playlist_item_cb(const char *index, mc_metadata_h meta, void *user_data);
+
 //Add callback function declarations here
 void _mc_server_playback_position_cmd_received_cb(const char* client_name, const char *request_id, unsigned long long position, void *user_data);
 void _mc_server_shuffle_mode_cmd_received_cb(const char* client_name, const char *request_id, mc_shuffle_mode_e mode, void *user_data);
@@ -108,6 +116,9 @@ 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_enable_cmd_received_cb(const char *client_name, const char *request_id, bool enable, 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);
 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);
@@ -119,26 +130,17 @@ void _mc_client_repeat_ability_updated_cb(const char *server_name, mc_ability_su
 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_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_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 _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 _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_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_client_display_rotation_ability_updated_cb(const char *server_name, unsigned int supported_rotations, void *user_data);
 
 
 //Add helper function declarations here
 gboolean wait_for_async();
+gboolean _mc_get_display_mode_ability(unsigned int supported_modes);
+gboolean _mc_get_display_rotation_ability(unsigned int supported_rotations);
 
 #endif /* _UTC_MEDIA_CONTROLLER_COMMON_H_ */