[mediacontroller] modify enum2

Change-Id: I31738b51871c1d993f00af41de50eaf14f112217

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
index 413a339549299852629b82a9a1ab973b6af38166..95e919294f2444d53946a08860d5139ba8431d67 100755 (executable)
--- 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
index 828b73c38e0519de195dd17fdedcace42274b2fc..122285eecaaead7f3822a1867e375e3d386ad6bf 100755 (executable)
--- a/src/mediacontroller/mediacontroller_types.cc
+++ b/src/mediacontroller/mediacontroller_types.cc
@@ -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(