[mediacontroller] modify enum

- due to http://168.219.209.56/jira/browse/ACR-381

Change-Id: I36eb08b642de6c11b8d602d07d4e033fa701e3b0

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
index fd60ef741e3472e66c20e7de80fc555426da8332..7fe089460fc8fa3d8eb8a285096077f539dcac36 100755 (executable)
--- 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_types.cc b/src/mediacontroller/mediacontroller_types.cc
index 0cb9c770b1f0312e6141af62ee1a2d949e2cc7c5..828b73c38e0519de195dd17fdedcace42274b2fc 100755 (executable)
--- 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}
     }}
 };