[UTC][capi-media-controller][Non-ACR][Rearrange error messages in startup]

Change-Id: I1407761eed74b33fcc58e1327b61cd0fee71adb7

diff --git a/src/utc/media-controller/utc-media-controller.c b/src/utc/media-controller/utc-media-controller.c
index 5d72da1204468784f839734acc01ae7c16810d01..a7136a6ea959a2c7c86897856bd6067e718f8b7f 100755 (executable)
--- a/src/utc/media-controller/utc-media-controller.c
+++ b/src/utc/media-controller/utc-media-controller.c
@@ -88,8 +88,7 @@ void utc_media_controller_startup(void)
     ret = mc_server_create(&g_mc_server);
     if(ret != MEDIA_CONTROLLER_ERROR_NONE)
     {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_create failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_create failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
@@ -97,48 +96,42 @@ void utc_media_controller_startup(void)
     // server initialize data, it will be removed by destroying server when test finish
     ret = mc_server_set_playback_state(g_mc_server, MC_PLAYBACK_STATE_PLAYING);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_state failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_playback_state failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_set_playback_position(g_mc_server, 10000);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_playback_position failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_set_playback_content_type(g_mc_server, g_mc_test_content_type);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_playback_content_type failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_set_content_age_rating(g_mc_server, g_mc_test_age_rating);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_content_age_rating failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
        ret = mc_server_set_playlist_item_info(g_mc_server, g_mc_test_playlist_name, g_mc_test_playlist_index);
        if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-               FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-               FPRINTF(" mc_server_set_playlist_item_index failed (code: %d)\\n", ret);
+               FPRINTF("[%s:%d] mc_server_set_playlist_item_info failed (code: %d)\\n", __FILE__, __LINE__, ret);
                startup_ret = ret;
                return;
        }
 
     ret = mc_server_update_playback_info(g_mc_server);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_update_playback_info failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_update_playback_info failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
@@ -156,56 +149,98 @@ void utc_media_controller_startup(void)
     ret = mc_server_set_metadata(g_mc_server, MC_META_MEDIA_PICTURE, g_mc_test_metadata[10]);
     ret = mc_server_update_metadata(g_mc_server);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_update_metadata failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_update_metadata failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_update_shuffle_mode(g_mc_server, MC_SHUFFLE_MODE_ON);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_update_shuffle_mode failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_update_shuffle_mode failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_update_repeat_mode(g_mc_server, MC_REPEAT_MODE_ON);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_update_repeat_mode failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_update_repeat_mode failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_PLAY, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_PAUSE, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_STOP, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_NEXT, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_PREV, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
        ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_FAST_FORWARD, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_REWIND, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
     ret = mc_server_set_playback_ability(g_mc_server, MC_PLAYBACK_ACTION_TOGGLE_PLAY_PAUSE, MC_ABILITY_SUPPORTED_YES);
+    if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
+        FPRINTF("[%s:%d] mc_server_set_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
+        startup_ret = ret;
+        return;
+    }
+
        ret = mc_server_update_playback_ability(g_mc_server);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_update_playback_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
        ret = mc_server_set_shuffle_ability(g_mc_server, g_mc_test_ability);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_shuffle_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
 
        ret = mc_server_set_repeat_ability(g_mc_server, g_mc_test_ability);
     if ( ret != MEDIA_CONTROLLER_ERROR_NONE) {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_server_set_playback_position failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_server_set_repeat_ability failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }
@@ -214,8 +249,7 @@ void utc_media_controller_startup(void)
     ret = mc_client_create(&g_mc_client);
     if(ret != MEDIA_CONTROLLER_ERROR_NONE)
     {
-        FPRINTF("Startup error at %s:%d\\n", __FILE__, __LINE__);
-        FPRINTF(" mc_client_create failed (code: %d)\\n", ret);
+        FPRINTF("[%s:%d] mc_client_create failed (code: %d)\\n", __FILE__, __LINE__, ret);
         startup_ret = ret;
         return;
     }