[MediaController] Added logs in methods onEntered and onReturn

Change-Id: Ia0c1a740f06a6f67b974affd7b74a7ed8a47aea7
Signed-off-by: Piotr Kosko <p.kosko@samsung.com>

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
index 4b52c8c71e011c36ee3c103a3efb4ebc980a33df..fd60ef741e3472e66c20e7de80fc555426da8332 100755 (executable)
--- a/src/mediacontroller/mediacontroller_client.cc
+++ b/src/mediacontroller/mediacontroller_client.cc
@@ -32,9 +32,11 @@ using common::PlatformResult;
 using common::ErrorCode;
 
 MediaControllerClient::MediaControllerClient() : handle_(nullptr) {
+  LoggerD("Enter");
 }
 
 MediaControllerClient::~MediaControllerClient() {
+  LoggerD("Enter");
   if (handle_) {
     int ret = mc_client_destroy(handle_);
     if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
@@ -44,6 +46,7 @@ MediaControllerClient::~MediaControllerClient() {
 }
 
 PlatformResult MediaControllerClient::Init() {
+  LoggerD("Enter");
   int ret = mc_client_create(&handle_);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
     LOGGER(ERROR) << "Unable to create media controller client, error: " << ret;
@@ -56,6 +59,7 @@ PlatformResult MediaControllerClient::Init() {
 
 PlatformResult MediaControllerClient::FindServers(picojson::array* servers) {
 
+  LoggerD("Enter");
   int ret;
 
   ret = mc_client_foreach_server(handle_, FindServersCallback, servers);
@@ -95,6 +99,7 @@ PlatformResult MediaControllerClient::FindServers(picojson::array* servers) {
 bool MediaControllerClient::FindServersCallback(const char* server_name,
                                                 void* user_data) {
 
+  LoggerD("Enter");
   picojson::array* servers = static_cast<picojson::array*>(user_data);
 
   picojson::value server = picojson::value(picojson::object());
@@ -111,6 +116,7 @@ bool MediaControllerClient::FindServersCallback(const char* server_name,
 PlatformResult MediaControllerClient::GetLatestServerInfo(
     picojson::value* server_info) {
 
+  LoggerD("Enter");
   int ret;
 
   char* name = nullptr;
@@ -150,6 +156,7 @@ PlatformResult MediaControllerClient::GetPlaybackInfo(
     const std::string& server_name,
     picojson::object* playback_info) {
 
+  LoggerD("Enter");
   int ret;
 
   mc_playback_h playback_h;
@@ -223,6 +230,7 @@ PlatformResult MediaControllerClient::GetMetadata(
     const std::string& server_name,
     picojson::object* metadata) {
 
+  LoggerD("Enter");
   int ret;
 
   mc_metadata_h metadata_h;
@@ -249,6 +257,7 @@ PlatformResult MediaControllerClient::GetMetadata(
 PlatformResult MediaControllerClient::SetServerStatusChangeListener(
     JsonCallback callback) {
 
+  LoggerD("Enter");
   if (callback && server_status_listener_) {
     LOGGER(ERROR) << "Listener already registered";
     return PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -285,6 +294,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name,
                                                  mc_server_state_e state,
                                                  void* user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->server_status_listener_) {
@@ -312,6 +322,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name,
 PlatformResult MediaControllerClient::SetPlaybackInfoListener(
     JsonCallback callback) {
 
+  LoggerD("Enter");
   if (callback && playback_info_listener_) {
     LOGGER(ERROR) << "Listener already registered";
     return PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -389,6 +400,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char *server_name,
                                              mc_playback_h playback,
                                              void *user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
@@ -426,6 +438,7 @@ void MediaControllerClient::OnShuffleModeUpdate(const char *server_name,
                                              mc_shuffle_mode_e mode,
                                              void *user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
@@ -446,6 +459,7 @@ void MediaControllerClient::OnRepeatModeUpdate(const char *server_name,
                                                 mc_repeat_mode_e mode,
                                                 void *user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
@@ -466,6 +480,7 @@ void MediaControllerClient::OnMetadataUpdate(const char* server_name,
                                              mc_metadata_h metadata_h,
                                              void* user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   if (!client->playback_info_listener_) {
@@ -497,6 +512,7 @@ PlatformResult MediaControllerClient::SendCommand(
     const std::string& reply_id,
     const JsonCallback& reply_cb) {
 
+  LoggerD("Enter");
   bundle* bundle = bundle_create();
   SCOPE_EXIT {
     bundle_free(bundle);
@@ -539,6 +555,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name,
                                            bundle* bundle,
                                            void* user_data) {
 
+  LoggerD("Enter");
   MediaControllerClient* client = static_cast<MediaControllerClient*>(user_data);
 
   picojson::value reply = picojson::value(picojson::object());
@@ -582,6 +599,7 @@ PlatformResult MediaControllerClient::SendPlaybackState(
     const std::string& server_name,
     const std::string& state) {
 
+  LoggerD("Enter");
   int state_e;
   PlatformResult result = Types::StringToPlatformEnum(
       Types::kMediaControllerPlaybackState, state, &state_e);

diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index a82dee7cc7f0f88beba9126dc5ebafedd69907da..521b662970d1d99db6abe35654c89ab42ecb9026 100755 (executable)
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -31,6 +31,7 @@ using common::PlatformResult;
 using common::TaskQueue;
 
 MediaControllerInstance::MediaControllerInstance() {
+  LoggerD("Enter");
   using namespace std::placeholders;
 
 #define REGISTER_SYNC(c, x) \
@@ -95,6 +96,7 @@ MediaControllerInstance::MediaControllerInstance() {
 }
 
 MediaControllerInstance::~MediaControllerInstance() {
+  LoggerD("Enter");
 }
 
 #define CHECK_EXIST(args, name, out) \
@@ -109,6 +111,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (server_) {
     ReportSuccess(out);
     return;
@@ -127,6 +130,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer(
 void MediaControllerInstance::MediaControllerServerUpdatePlaybackState(
     const picojson::value& args,
     picojson::object& out) {
+  LoggerD("Enter");
   CHECK_EXIST(args, "state", out)
 
   if (!server_) {
@@ -138,6 +142,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackState(
   const std::string& state = args.get("state").get<std::string>();
   const PlatformResult& result = server_->SetPlaybackState(state);
   if (!result) {
+    LoggerE("Failed server_->SetPlaybackState()");
     ReportError(result, &out);
     return;
   }
@@ -149,7 +154,9 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
         "Server not initialized."), &out);
     return;
@@ -160,6 +167,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition(
   double position = args.get("position").get<double>();
   const PlatformResult& result = server_->SetPlaybackPosition(position);
   if (!result) {
+    LoggerE("Failed: server_->SetPlaybackPosition()");
     ReportError(result, &out);
     return;
   }
@@ -171,7 +179,9 @@ void MediaControllerInstance::MediaControllerServerUpdateShuffleMode(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
         "Server not initialized."), &out);
     return;
@@ -183,6 +193,7 @@ void MediaControllerInstance::MediaControllerServerUpdateShuffleMode(
 
   const PlatformResult& result = server_->SetShuffleMode(mode);
   if (!result) {
+    LoggerE("Failed: server_->SetShuffleMode()");
     ReportError(result, &out);
     return;
   }
@@ -194,7 +205,10 @@ void MediaControllerInstance::MediaControllerServerUpdateRepeatMode(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
+
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
         "Server not initialized."), &out);
     return;
@@ -206,6 +220,7 @@ void MediaControllerInstance::MediaControllerServerUpdateRepeatMode(
 
   const PlatformResult& result = server_->SetRepeatMode(mode);
   if (!result) {
+    LoggerE("Failed: server_->SetRepeatMode()");
     ReportError(result, &out);
     return;
   }
@@ -217,7 +232,9 @@ void MediaControllerInstance::MediaControllerServerUpdateMetadata(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
         "Server not initialized."), &out);
     return;
@@ -230,6 +247,7 @@ void MediaControllerInstance::MediaControllerServerUpdateMetadata(
 
   const PlatformResult& result = server_->SetMetadata(metadata);
   if (!result) {
+    LoggerE("Failed: server_->SetMetadata()");
     ReportError(result, &out);
     return;
   }
@@ -241,7 +259,9 @@ void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoL
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Server not initialized."), &out);
     return;
@@ -271,7 +291,9 @@ void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackIn
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Server not initialized."), &out);
     return;
@@ -284,7 +306,9 @@ void MediaControllerInstance::MediaControllerServerAddCommandListener(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Server not initialized."), &out);
     return;
@@ -307,7 +331,9 @@ void MediaControllerInstance::MediaControllerServerReplyCommand(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Server not initialized."), &out);
     return;
@@ -328,7 +354,9 @@ void MediaControllerInstance::MediaControllerServerRemoveCommandListener(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!server_) {
+    LoggerE("Failed: server_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Server not initialized."), &out);
     return;
@@ -343,6 +371,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (client_) {
     ReportSuccess(out);
     return;
@@ -352,6 +381,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient(
   const PlatformResult& result = client_->Init();
   if (!result) {
     client_.reset();
+    LoggerE("Failed: client_->Init()");
     ReportError(result, &out);
   }
 
@@ -362,7 +392,10 @@ void MediaControllerInstance::MediaControllerClientFindServers(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
+    LoggerE("Failed: client_");
+
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
     return;
@@ -398,7 +431,9 @@ void MediaControllerInstance::MediaControllerClientGetLatestServerInfo(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
+    LoggerE("Failed: client_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
     return;
@@ -407,6 +442,7 @@ void MediaControllerInstance::MediaControllerClientGetLatestServerInfo(
   picojson::value server_info = picojson::value();
   PlatformResult result = client_->GetLatestServerInfo(&server_info);
   if (!result) {
+    LoggerE("Failed: client_->GetLatestServerInfo");
     ReportError(result, &out);
     return;
   }
@@ -418,6 +454,7 @@ void MediaControllerInstance::MediaControllerClientGetPlaybackInfo(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
@@ -432,6 +469,7 @@ void MediaControllerInstance::MediaControllerClientGetPlaybackInfo(
       &playback_info.get<picojson::object>());
 
   if (!result) {
+    LoggerE("Failed: client_->GetPlaybackInfo");
     ReportError(result, &out);
     return;
   }
@@ -443,7 +481,9 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
+    LoggerE("Failed: client_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
     return;
@@ -465,6 +505,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState(
     if (result) {
       ReportSuccess(response_obj);
     } else {
+      LoggerE("Failed: client_->SendPlaybackState");
       ReportError(result, &response_obj);
     }
 
@@ -480,6 +521,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
@@ -502,6 +544,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition(
     if (result) {
       ReportSuccess(response_obj);
     } else {
+      LoggerE("Failed: client_->SendPlaybackPosition");
       ReportError(result, &response_obj);
     }
 
@@ -517,6 +560,8 @@ void MediaControllerInstance::MediaControllerServerInfoSendShuffleMode(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
+
   if (!client_) {
     LOGGER(ERROR) << "Client not initialized.";
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -555,6 +600,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendRepeatMode(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     LOGGER(ERROR) << "Client not initialized.";
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -593,6 +639,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendCommand(
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     LOGGER(ERROR) << "Client not initialized.";
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -633,6 +680,7 @@ void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeList
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
@@ -663,6 +711,7 @@ void MediaControllerInstance::MediaControllerServerInfoRemoveServerStatusChangeL
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
@@ -676,7 +725,9 @@ void MediaControllerInstance::MediaControllerServerInfoAddPlaybackInfoChangeList
     const picojson::value& args,
     picojson::object& out) {
 
+  LoggerD("Enter");
   if (!client_) {
+    LoggerE("client_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
     return;
@@ -707,6 +758,7 @@ void MediaControllerInstance::MediaControllerServerInfoRemovePlaybackInfoChangeL
     picojson::object& out) {
 
   if (!client_) {
+    LoggerE("client_");
     ReportError(PlatformResult(ErrorCode::INVALID_STATE_ERR,
                                "Client not initialized."), &out);
     return;

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
index 0075e9ab33b69ad111bcf064c31bd07c8bc0cffd..98bcfe45999cb5b0afb6dd452acbfb3c16969438 100755 (executable)
--- a/src/mediacontroller/mediacontroller_server.cc
+++ b/src/mediacontroller/mediacontroller_server.cc
@@ -41,10 +41,13 @@ using common::PlatformResult;
 using common::ErrorCode;
 
 MediaControllerServer::MediaControllerServer() : handle_(nullptr) {
+  LoggerD("Enter");
 }
 
 MediaControllerServer::~MediaControllerServer() {
 
+  LoggerD("Enter");
+
   if (handle_) {
     int ret;
     ret = mc_server_unset_custom_command_received_cb(handle_);
@@ -61,6 +64,8 @@ MediaControllerServer::~MediaControllerServer() {
 
 PlatformResult MediaControllerServer::Init() {
 
+  LoggerD("Enter");
+
   int ret = mc_server_create(&handle_);
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
     LOGGER(ERROR) << "Unable to create media controller server, error: " << ret;
@@ -83,6 +88,8 @@ PlatformResult MediaControllerServer::Init() {
 PlatformResult MediaControllerServer::SetPlaybackState(
     const std::string& state) {
 
+  LoggerD("Enter");
+
   int state_int;
   PlatformResult result = Types::StringToPlatformEnum(
       Types::kMediaControllerPlaybackState, state, &state_int);
@@ -111,6 +118,8 @@ PlatformResult MediaControllerServer::SetPlaybackState(
 
 PlatformResult MediaControllerServer::SetPlaybackPosition(double position) {
 
+  LoggerD("Enter");
+
   int ret = mc_server_set_playback_position(
       handle_, static_cast<unsigned long long>(position));
   if (ret != MEDIA_CONTROLLER_ERROR_NONE) {
@@ -131,6 +140,8 @@ PlatformResult MediaControllerServer::SetPlaybackPosition(double position) {
 
 PlatformResult MediaControllerServer::SetShuffleMode(bool mode) {
 
+  LoggerD("Enter");
+
   int ret = mc_server_update_shuffle_mode(handle_,
                                           mode ? SHUFFLE_MODE_ON
                                                : SHUFFLE_MODE_OFF);
@@ -145,6 +156,8 @@ PlatformResult MediaControllerServer::SetShuffleMode(bool mode) {
 
 PlatformResult MediaControllerServer::SetRepeatMode(bool mode) {
 
+  LoggerD("Enter");
+
   int ret = mc_server_update_repeat_mode(handle_,
                                          mode ? REPEAT_MODE_ON
                                               : REPEAT_MODE_OFF);
@@ -159,6 +172,8 @@ PlatformResult MediaControllerServer::SetRepeatMode(bool mode) {
 PlatformResult MediaControllerServer::SetMetadata(
     const picojson::object& metadata) {
 
+  LoggerD("Enter");
+
   int attribute_int, ret;
   for (picojson::object::const_iterator i = metadata.begin();
        i != metadata.end();
@@ -193,6 +208,8 @@ void MediaControllerServer::OnCommandReceived(const char* client_name,
                                               bundle* bundle,
                                               void* user_data) {
 
+  LoggerD("Enter");
+
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   int ret;
@@ -272,6 +289,8 @@ PlatformResult MediaControllerServer::CommandReply(
     const std::string& reply_id,
     const picojson::value& data) {
 
+  LoggerD("Enter");
+
   int ret;
 
   bundle* bundle = bundle_create();
@@ -305,6 +324,8 @@ PlatformResult MediaControllerServer::CommandReply(
 PlatformResult MediaControllerServer::SetChangeRequestPlaybackInfoListener(
     JsonCallback callback) {
 
+  LoggerD("Enter");
+
   if (callback && change_request_playback_info_listener_) {
     LOGGER(ERROR) << "Listener already registered";
     return PlatformResult(ErrorCode::INVALID_STATE_ERR,
@@ -338,6 +359,8 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name,
                                                    mc_playback_states_e state_e,
                                                    void *user_data) {
 
+  LoggerD("Enter");
+
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
@@ -368,6 +391,8 @@ void MediaControllerServer::OnPlaybackPositionCommand(
     unsigned long long position,
     void* user_data) {
 
+  LoggerD("Enter");
+
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
@@ -388,6 +413,8 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name,
                                                  mc_shuffle_mode_e mode,
                                                  void* user_data) {
 
+  LoggerD("Enter");
+
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {
@@ -408,6 +435,8 @@ void MediaControllerServer::OnRepeatModeCommand(const char* client_name,
                                                 mc_repeat_mode_e mode,
                                                 void* user_data) {
 
+  LoggerD("Enter");
+
   MediaControllerServer* server = static_cast<MediaControllerServer*>(user_data);
 
   if (!server->change_request_playback_info_listener_) {

diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc
index 58653c70ea71919d56211724f6b65e344c4d8ecd..fae55e1b6a2824601d223329365f0db9d5655884 100755 (executable)
--- a/src/mediacontroller/mediacontroller_types.cc
+++ b/src/mediacontroller/mediacontroller_types.cc
@@ -67,6 +67,8 @@ PlatformEnumReverseMap Types::platform_enum_reverse_map_ = {};
 PlatformResult Types::GetPlatformEnumMap(const std::string& type,
                                   std::map<std::string, int>* enum_map) {
 
+  LoggerD("Enter");
+
   auto iter = platform_enum_map_.find(type);
   if (iter == platform_enum_map_.end()) {
     return PlatformResult(ErrorCode::UNKNOWN_ERR,
@@ -81,6 +83,9 @@ PlatformResult Types::GetPlatformEnumMap(const std::string& type,
 PlatformResult Types::StringToPlatformEnum(const std::string& type,
                                            const std::string& value,
                                            int* platform_enum) {
+
+  LoggerD("Enter");
+
   std::map<std::string, int> def;
   PlatformResult result = GetPlatformEnumMap(type, &def);
   if (!result) {
@@ -101,6 +106,8 @@ PlatformResult Types::StringToPlatformEnum(const std::string& type,
 PlatformResult Types::PlatformEnumToString(const std::string& type,
                                            int value,
                                            std::string* platform_str) {
+  LoggerD("Enter");
+
   // TODO(r.galka) can be replaced by Boost.Bimap
   if (platform_enum_reverse_map_.empty()) {
     for (auto& def : platform_enum_map_) {
@@ -132,6 +139,8 @@ PlatformResult Types::PlatformEnumToString(const std::string& type,
 
 PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h,
                                            std::string* state) {
+  LoggerD("Enter");
+
   int ret;
   mc_playback_states_e state_e;
   ret = mc_client_get_playback_state(playback_h, &state_e);
@@ -157,6 +166,8 @@ PlatformResult Types::ConvertPlaybackState(mc_playback_h playback_h,
 
 PlatformResult Types::ConvertPlaybackPosition(mc_playback_h playback_h,
                                               double* position) {
+  LoggerD("Enter");
+
   int ret;
 
   unsigned long long pos;
@@ -174,6 +185,8 @@ PlatformResult Types::ConvertPlaybackPosition(mc_playback_h playback_h,
 
 PlatformResult Types::ConvertMetadata(mc_metadata_h metadata_h,
                                       picojson::object* metadata) {
+  LoggerD("Enter");
+
   std::map<std::string, int> metadata_fields;
   PlatformResult result = GetPlatformEnumMap(
       Types::kMediaControllerMetadataAttribute, &metadata_fields);