From df9b8db1fb684466ef899dad9d281d372f4b0af3 Mon Sep 17 00:00:00 2001 From: Piotr Kosko Date: Wed, 27 May 2015 14:09:21 +0200 Subject: [PATCH] [MediaController] Added logs in methods onEntered and onReturn Change-Id: Ia0c1a740f06a6f67b974affd7b74a7ed8a47aea7 Signed-off-by: Piotr Kosko --- src/mediacontroller/mediacontroller_client.cc | 18 +++++++++ src/mediacontroller/mediacontroller_instance.cc | 52 +++++++++++++++++++++++++ src/mediacontroller/mediacontroller_server.cc | 29 ++++++++++++++ src/mediacontroller/mediacontroller_types.cc | 13 +++++++ 4 files changed, 112 insertions(+) diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc index 920b303..a562724 100644 --- a/src/mediacontroller/mediacontroller_client.cc +++ b/src/mediacontroller/mediacontroller_client.cc @@ -20,9 +20,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) { @@ -32,6 +34,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; @@ -44,6 +47,7 @@ PlatformResult MediaControllerClient::Init() { PlatformResult MediaControllerClient::FindServers(picojson::array* servers) { + LoggerD("Enter"); int ret; ret = mc_client_foreach_server(handle_, FindServersCallback, servers); @@ -83,6 +87,7 @@ PlatformResult MediaControllerClient::FindServers(picojson::array* servers) { bool MediaControllerClient::FindServersCallback(const char* server_name, void* user_data) { + LoggerD("Enter"); picojson::array* servers = static_cast(user_data); picojson::value server = picojson::value(picojson::object()); @@ -99,6 +104,7 @@ bool MediaControllerClient::FindServersCallback(const char* server_name, PlatformResult MediaControllerClient::GetLatestServerInfo( picojson::value* server_info) { + LoggerD("Enter"); int ret; char* name = nullptr; @@ -138,6 +144,7 @@ PlatformResult MediaControllerClient::GetPlaybackInfo( const std::string& server_name, picojson::object* playback_info) { + LoggerD("Enter"); int ret; mc_playback_h playback_h; @@ -211,6 +218,7 @@ PlatformResult MediaControllerClient::GetMetadata( const std::string& server_name, picojson::object* metadata) { + LoggerD("Enter"); int ret; mc_metadata_h metadata_h; @@ -237,6 +245,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, @@ -273,6 +282,7 @@ void MediaControllerClient::OnServerStatusUpdate(const char* server_name, mc_server_state_e state, void* user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); if (!client->server_status_listener_) { @@ -300,6 +310,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, @@ -377,6 +388,7 @@ void MediaControllerClient::OnPlaybackUpdate(const char *server_name, mc_playback_h playback, void *user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -414,6 +426,7 @@ void MediaControllerClient::OnShuffleModeUpdate(const char *server_name, mc_shuffle_mode_e mode, void *user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -434,6 +447,7 @@ void MediaControllerClient::OnRepeatModeUpdate(const char *server_name, mc_repeat_mode_e mode, void *user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -454,6 +468,7 @@ void MediaControllerClient::OnMetadataUpdate(const char* server_name, mc_metadata_h metadata_h, void* user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); if (!client->playback_info_listener_) { @@ -485,6 +500,7 @@ PlatformResult MediaControllerClient::SendCommand( const std::string& reply_id, const JsonCallback& reply_cb) { + LoggerD("Enter"); bundle* bundle = bundle_create(); SCOPE_EXIT { bundle_free(bundle); @@ -527,6 +543,7 @@ void MediaControllerClient::OnCommandReply(const char* server_name, bundle* bundle, void* user_data) { + LoggerD("Enter"); MediaControllerClient* client = static_cast(user_data); picojson::value reply = picojson::value(picojson::object()); @@ -570,6 +587,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 a6b15d1..0246410 100644 --- a/src/mediacontroller/mediacontroller_instance.cc +++ b/src/mediacontroller/mediacontroller_instance.cc @@ -19,6 +19,7 @@ using common::PlatformResult; using common::TaskQueue; MediaControllerInstance::MediaControllerInstance() { + LoggerD("Enter"); using namespace std::placeholders; #define REGISTER_SYNC(c, x) \ @@ -83,6 +84,7 @@ MediaControllerInstance::MediaControllerInstance() { } MediaControllerInstance::~MediaControllerInstance() { + LoggerD("Enter"); } #define CHECK_EXIST(args, name, out) \ @@ -97,6 +99,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer( const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); if (server_) { ReportSuccess(out); return; @@ -115,6 +118,7 @@ void MediaControllerInstance::MediaControllerManagerCreateServer( void MediaControllerInstance::MediaControllerServerUpdatePlaybackState( const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); CHECK_EXIST(args, "state", out) if (!server_) { @@ -126,6 +130,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackState( const std::string& state = args.get("state").get(); const PlatformResult& result = server_->SetPlaybackState(state); if (!result) { + LoggerE("Failed server_->SetPlaybackState()"); ReportError(result, &out); return; } @@ -137,7 +142,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; @@ -148,6 +155,7 @@ void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition( double position = args.get("position").get(); const PlatformResult& result = server_->SetPlaybackPosition(position); if (!result) { + LoggerE("Failed: server_->SetPlaybackPosition()"); ReportError(result, &out); return; } @@ -159,7 +167,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; @@ -171,6 +181,7 @@ void MediaControllerInstance::MediaControllerServerUpdateShuffleMode( const PlatformResult& result = server_->SetShuffleMode(mode); if (!result) { + LoggerE("Failed: server_->SetShuffleMode()"); ReportError(result, &out); return; } @@ -182,7 +193,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; @@ -194,6 +208,7 @@ void MediaControllerInstance::MediaControllerServerUpdateRepeatMode( const PlatformResult& result = server_->SetRepeatMode(mode); if (!result) { + LoggerE("Failed: server_->SetRepeatMode()"); ReportError(result, &out); return; } @@ -205,7 +220,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; @@ -218,6 +235,7 @@ void MediaControllerInstance::MediaControllerServerUpdateMetadata( const PlatformResult& result = server_->SetMetadata(metadata); if (!result) { + LoggerE("Failed: server_->SetMetadata()"); ReportError(result, &out); return; } @@ -229,7 +247,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; @@ -259,7 +279,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; @@ -272,7 +294,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; @@ -295,7 +319,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; @@ -316,7 +342,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; @@ -331,6 +359,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient( const picojson::value& args, picojson::object& out) { + LoggerD("Enter"); if (client_) { ReportSuccess(out); return; @@ -340,6 +369,7 @@ void MediaControllerInstance::MediaControllerManagerGetClient( const PlatformResult& result = client_->Init(); if (!result) { client_.reset(); + LoggerE("Failed: client_->Init()"); ReportError(result, &out); } @@ -350,7 +380,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; @@ -386,7 +419,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; @@ -395,6 +430,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; } @@ -406,6 +442,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); @@ -420,6 +457,7 @@ void MediaControllerInstance::MediaControllerClientGetPlaybackInfo( &playback_info.get()); if (!result) { + LoggerE("Failed: client_->GetPlaybackInfo"); ReportError(result, &out); return; } @@ -431,7 +469,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; @@ -453,6 +493,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState( if (result) { ReportSuccess(response_obj); } else { + LoggerE("Failed: client_->SendPlaybackState"); ReportError(result, &response_obj); } @@ -468,6 +509,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); @@ -490,6 +532,7 @@ void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition( if (result) { ReportSuccess(response_obj); } else { + LoggerE("Failed: client_->SendPlaybackPosition"); ReportError(result, &response_obj); } @@ -505,6 +548,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, @@ -543,6 +588,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, @@ -581,6 +627,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, @@ -621,6 +668,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); @@ -651,6 +699,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); @@ -664,7 +713,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; @@ -695,6 +746,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 fb599cd..5d42cf7 100644 --- a/src/mediacontroller/mediacontroller_server.cc +++ b/src/mediacontroller/mediacontroller_server.cc @@ -29,10 +29,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_); @@ -49,6 +52,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; @@ -71,6 +76,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); @@ -99,6 +106,8 @@ PlatformResult MediaControllerServer::SetPlaybackState( PlatformResult MediaControllerServer::SetPlaybackPosition(double position) { + LoggerD("Enter"); + int ret = mc_server_set_playback_position( handle_, static_cast(position)); if (ret != MEDIA_CONTROLLER_ERROR_NONE) { @@ -119,6 +128,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); @@ -133,6 +144,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); @@ -147,6 +160,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(); @@ -181,6 +196,8 @@ void MediaControllerServer::OnCommandReceived(const char* client_name, bundle* bundle, void* user_data) { + LoggerD("Enter"); + MediaControllerServer* server = static_cast(user_data); int ret; @@ -260,6 +277,8 @@ PlatformResult MediaControllerServer::CommandReply( const std::string& reply_id, const picojson::value& data) { + LoggerD("Enter"); + int ret; bundle* bundle = bundle_create(); @@ -293,6 +312,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, @@ -326,6 +347,8 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name, mc_playback_states_e state_e, void *user_data) { + LoggerD("Enter"); + MediaControllerServer* server = static_cast(user_data); if (!server->change_request_playback_info_listener_) { @@ -356,6 +379,8 @@ void MediaControllerServer::OnPlaybackPositionCommand( unsigned long long position, void* user_data) { + LoggerD("Enter"); + MediaControllerServer* server = static_cast(user_data); if (!server->change_request_playback_info_listener_) { @@ -376,6 +401,8 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shuffle_mode_e mode, void* user_data) { + LoggerD("Enter"); + MediaControllerServer* server = static_cast(user_data); if (!server->change_request_playback_info_listener_) { @@ -396,6 +423,8 @@ void MediaControllerServer::OnRepeatModeCommand(const char* client_name, mc_repeat_mode_e mode, void* user_data) { + LoggerD("Enter"); + MediaControllerServer* server = static_cast(user_data); if (!server->change_request_playback_info_listener_) { diff --git a/src/mediacontroller/mediacontroller_types.cc b/src/mediacontroller/mediacontroller_types.cc index f732f31..d839d4b 100644 --- a/src/mediacontroller/mediacontroller_types.cc +++ b/src/mediacontroller/mediacontroller_types.cc @@ -55,6 +55,8 @@ PlatformEnumReverseMap Types::platform_enum_reverse_map_ = {}; PlatformResult Types::GetPlatformEnumMap(const std::string& type, std::map* enum_map) { + LoggerD("Enter"); + auto iter = platform_enum_map_.find(type); if (iter == platform_enum_map_.end()) { return PlatformResult(ErrorCode::UNKNOWN_ERR, @@ -69,6 +71,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 def; PlatformResult result = GetPlatformEnumMap(type, &def); if (!result) { @@ -89,6 +94,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_) { @@ -120,6 +127,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); @@ -145,6 +154,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; @@ -162,6 +173,8 @@ PlatformResult Types::ConvertPlaybackPosition(mc_playback_h playback_h, PlatformResult Types::ConvertMetadata(mc_metadata_h metadata_h, picojson::object* metadata) { + LoggerD("Enter"); + std::map metadata_fields; PlatformResult result = GetPlatformEnumMap( Types::kMediaControllerMetadataAttribute, &metadata_fields); -- 2.7.4