[Mediacontroller] apply new enum value.

Change-Id: Ic57066a6bf8d1814e4134cf38e0f06587e91bff4
Signed-off-by: jk.pu <jk.pu@samsung.com>

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
old mode 100755 (executable)
new mode 100644 (file)
index fd60ef7..7fe0894
--- a/src/mediacontroller/mediacontroller_client.cc
+++ b/src/mediacontroller/mediacontroller_client.cc
@@ -219,8 +219,8 @@ PlatformResult MediaControllerClient::GetPlaybackInfo(
   // fill return object
   (*playback_info)["state"] = picojson::value(state);
   (*playback_info)["position"] = picojson::value(position);
-  (*playback_info)["shuffleMode"] = picojson::value(shuffle == SHUFFLE_MODE_ON);
-  (*playback_info)["repeatMode"] = picojson::value(repeat == REPEAT_MODE_ON);
+  (*playback_info)["shuffleMode"] = picojson::value(shuffle == MC_SHUFFLE_MODE_ON);
+  (*playback_info)["repeatMode"] = picojson::value(repeat == MC_REPEAT_MODE_ON);
   (*playback_info)["metadata"] = metadata;
 
   return PlatformResult(ErrorCode::NO_ERROR);
@@ -450,7 +450,7 @@ void MediaControllerClient::OnShuffleModeUpdate(const char *server_name,
   picojson::object& data_o = data.get<picojson::object>();
 
   data_o["action"] = picojson::value(std::string("onshufflemodechanged"));
-  data_o["mode"] = picojson::value(mode == SHUFFLE_MODE_ON);
+  data_o["mode"] = picojson::value(mode == MC_SHUFFLE_MODE_ON);
 
   client->playback_info_listener_(&data);
 }
@@ -471,7 +471,7 @@ void MediaControllerClient::OnRepeatModeUpdate(const char *server_name,
   picojson::object& data_o = data.get<picojson::object>();
 
   data_o["action"] = picojson::value(std::string("onrepeatmodechanged"));
-  data_o["mode"] = picojson::value(mode == REPEAT_MODE_ON);
+  data_o["mode"] = picojson::value(mode == MC_REPEAT_MODE_ON);
 
   client->playback_info_listener_(&data);
 }

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
old mode 100755 (executable)
new mode 100644 (file)
index 413a339..95e9192
--- a/src/mediacontroller/mediacontroller_server.cc
+++ b/src/mediacontroller/mediacontroller_server.cc
@@ -143,8 +143,8 @@ PlatformResult MediaControllerServer::SetShuffleMode(bool mode) {
   LoggerD("Enter");
 
   int ret = mc_server_update_shuffle_mode(handle_,
-                                          mode ? SHUFFLE_MODE_ON
-                                               : SHUFFLE_MODE_OFF);
+                                          mode ? MC_SHUFFLE_MODE_ON
+                                               : MC_SHUFFLE_MODE_OFF);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
     LOGGER(ERROR) << "mc_server_update_shuffle_mode failed, error: " << ret;
     return PlatformResult(ErrorCode::UNKNOWN_ERR,
@@ -159,8 +159,8 @@ PlatformResult MediaControllerServer::SetRepeatMode(bool mode) {
   LoggerD("Enter");
 
   int ret = mc_server_update_repeat_mode(handle_,
-                                         mode ? REPEAT_MODE_ON
-                                              : REPEAT_MODE_OFF);
+                                         mode ? MC_REPEAT_MODE_ON
+                                              : MC_REPEAT_MODE_OFF);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
     LOGGER(ERROR) << "mc_server_update_repeat_mode failed, error: " << ret;
     return PlatformResult(ErrorCode::UNKNOWN_ERR, "Error updating repeat mode");
@@ -256,7 +256,7 @@ void MediaControllerServer::OnCommandReceived(const char* client_name,
     bool mode = data.get("mode").get<bool>();
     server->SetShuffleMode(mode);
     server->OnShuffleModeCommand(client_name,
-                                 mode ? SHUFFLE_MODE_ON : SHUFFLE_MODE_OFF,
+                                 mode ? MC_SHUFFLE_MODE_ON : MC_SHUFFLE_MODE_OFF,
                                  server);
     server->CommandReply(client_name, reply_id_str, data);
     return;
@@ -265,7 +265,7 @@ void MediaControllerServer::OnCommandReceived(const char* client_name,
     bool mode = data.get("mode").get<bool>();
     server->SetRepeatMode(mode);
     server->OnRepeatModeCommand(client_name,
-                                mode ? REPEAT_MODE_ON : REPEAT_MODE_OFF,
+                                mode ? MC_REPEAT_MODE_ON : MC_REPEAT_MODE_OFF,
                                 server);
     server->CommandReply(client_name, reply_id_str, data);
     return;
@@ -426,7 +426,7 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name,
   picojson::object& data_o = data.get<picojson::object>();
 
   data_o["action"] = picojson::value(std::string("onshufflemoderequest"));
-  data_o["mode"] = picojson::value(mode == SHUFFLE_MODE_ON);
+  data_o["mode"] = picojson::value(mode == MC_SHUFFLE_MODE_ON);
 
   server->change_request_playback_info_listener_(&data);
 }
@@ -448,7 +448,7 @@ void MediaControllerServer::OnRepeatModeCommand(const char* client_name,
   picojson::object& data_o = data.get<picojson::object>();
 
   data_o["action"] = picojson::value(std::string("onrepeatmoderequest"));
-  data_o["mode"] = picojson::value(mode == REPEAT_MODE_ON);
+  data_o["mode"] = picojson::value(mode == MC_REPEAT_MODE_ON);
 
   server->change_request_playback_info_listener_(&data);
 }

diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc
old mode 100755 (executable)
new mode 100644 (file)
index b6c194c..3f40b31
--- a/src/mediacontroller/mediacontroller_types.cc
+++ b/src/mediacontroller/mediacontroller_types.cc
@@ -40,25 +40,25 @@ const PlatformEnumMap Types::platform_enum_map_ = {
         {"ACTIVE", MC_SERVER_STATE_ACTIVATE},
         {"INACTIVE", MC_SERVER_STATE_DEACTIVATE}}},
     {kMediaControllerPlaybackState, {
-        {"PLAY", MEDIA_PLAYBACK_STATE_PLAYING},
-        {"PAUSE", MEDIA_PLAYBACK_STATE_PAUSED},
-        {"STOP", MEDIA_PLAYBACK_STATE_STOPPED},
-        {"NEXT", MEDIA_PLAYBACK_STATE_NEXT_FILE},
-        {"PREV", MEDIA_PLAYBACK_STATE_PREV_FILE},
-        {"FORWARD", MEDIA_PLAYBACK_STATE_FAST_FORWARD},
-        {"REWIND", MEDIA_PLAYBACK_STATE_REWIND}}},
+        {"PLAY", MC_PLAYBACK_STATE_PLAYING},
+        {"PAUSE", MC_PLAYBACK_STATE_PAUSED},
+        {"STOP", MC_PLAYBACK_STATE_STOPPED},
+        {"NEXT", MC_PLAYBACK_STATE_NEXT_FILE},
+        {"PREV", MC_PLAYBACK_STATE_PREV_FILE},
+        {"FORWARD", MC_PLAYBACK_STATE_FAST_FORWARD},
+        {"REWIND", MC_PLAYBACK_STATE_REWIND}}},
     {kMediaControllerMetadataAttribute, {
-        {"title", MEDIA_TITLE},
-        {"artist", MEDIA_ARTIST},
-        {"album", MEDIA_ALBUM},
-        {"author", MEDIA_AUTHOR},
-        {"genre", MEDIA_GENRE},
-        {"duration", MEDIA_DURATION},
-        {"date", MEDIA_DATE},
-        {"copyright", MEDIA_COPYRIGHT},
-        {"description", MEDIA_DESCRIPTION},
-        {"trackNum", MEDIA_TRACK_NUM},
-        {"picture", MEDIA_PICTURE}
+        {"title", MC_META_MEDIA_TITLE},
+        {"artist", MC_META_MEDIA_ARTIST},
+        {"album", MC_META_MEDIA_ALBUM},
+        {"author", MC_META_MEDIA_AUTHOR},
+        {"genre", MC_META_MEDIA_GENRE},
+        {"duration", MC_META_MEDIA_DURATION},
+        {"date", MC_META_MEDIA_DATE},
+        {"copyright", MC_META_MEDIA_COPYRIGHT},
+        {"description", MC_META_MEDIA_DESCRIPTION},
+        {"trackNum", MC_META_MEDIA_TRACK_NUM},
+        {"picture", MC_META_MEDIA_PICTURE}
     }}
 };
 
@@ -149,8 +149,8 @@ PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h,
     return PlatformResult(ErrorCode::UNKNOWN_ERR,
                           "Error getting playback state");
   }
-  if (state_e == MEDIA_PLAYBACK_STATE_NONE) {
-    state_e = MEDIA_PLAYBACK_STATE_STOPPED;
+  if (state_e == MC_PLAYBACK_STATE_NONE) {
+    state_e = MC_PLAYBACK_STATE_STOPPED;
   }
 
   PlatformResult result = Types::PlatformEnumToString(