From: Szymon Jastrzebski Date: Wed, 27 Jun 2018 10:21:48 +0000 (+0200) Subject: [MediaController] Replacing old functions with new equivalent X-Git-Tag: submit/tizen/20180628.091114~1 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=f570a626cb2ab5ba7618a9b75f50552b8dfc71c5;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [MediaController] Replacing old functions with new equivalent The part of Native API has been removed and needs to be replaced with new one. Related to Native ACR-1235 [Verification] Code successfully built. MC TCT M&A 100% Change-Id: Iad47da5f58bd99a3505248b9f9a25e45cb7048db Signed-off-by: Szymon Jastrzebski --- diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc index 43e3c896..cce90a29 100644 --- a/src/mediacontroller/mediacontroller_client.cc +++ b/src/mediacontroller/mediacontroller_client.cc @@ -561,12 +561,18 @@ PlatformResult MediaControllerClient::SendPlaybackState(const std::string& serve PlatformResult MediaControllerClient::SendPlaybackPosition(const std::string& server_name, double position) { ScopeLogger(); - int ret = mc_client_send_playback_position_command(handle_, server_name.c_str(), - static_cast(position)); + /* TODO: Prepare an ACR and propose use case for request_id. + char* request_id = nullptr; + SCOPE_EXIT { + free(request_id); + };*/ + int ret = mc_client_send_playback_position_cmd(handle_, server_name.c_str(), + static_cast(position), + /*&request_id*/ nullptr); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error sending playback position", - ("mc_client_send_playback_position_command() error: %d, message: %s", - ret, get_error_message(ret))); + ("mc_client_send_playback_position_cmd() error: %d, message: %s", ret, + get_error_message(ret))); } return PlatformResult(ErrorCode::NO_ERROR); @@ -574,12 +580,18 @@ PlatformResult MediaControllerClient::SendPlaybackPosition(const std::string& se PlatformResult MediaControllerClient::SendShuffleMode(const std::string& server_name, bool mode) { ScopeLogger(); - int ret = mc_client_send_shuffle_mode_command(handle_, server_name.c_str(), - mode ? MC_SHUFFLE_MODE_ON : MC_SHUFFLE_MODE_OFF); + /* TODO: Prepare an ACR and propose use case for request_id. + char* request_id = nullptr; + SCOPE_EXIT { + free(request_id); + };*/ + int ret = mc_client_send_shuffle_mode_cmd(handle_, server_name.c_str(), + mode ? MC_SHUFFLE_MODE_ON : MC_SHUFFLE_MODE_OFF, + /*&request_id*/ nullptr); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { - return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error sending shuffle mode", - ("mc_client_send_shuffle_mode_command() error: %d, message: %s", ret, - get_error_message(ret))); + return LogAndCreateResult( + ErrorCode::UNKNOWN_ERR, "Error sending shuffle mode", + ("mc_client_send_shuffle_mode_cmd() error: %d, message: %s", ret, get_error_message(ret))); } return PlatformResult(ErrorCode::NO_ERROR); @@ -587,12 +599,18 @@ PlatformResult MediaControllerClient::SendShuffleMode(const std::string& server_ PlatformResult MediaControllerClient::SendRepeatMode(const std::string& server_name, bool mode) { ScopeLogger(); - int ret = mc_client_send_repeat_mode_command(handle_, server_name.c_str(), - mode ? MC_REPEAT_MODE_ON : MC_REPEAT_MODE_OFF); + /* TODO: Prepare an ACR and propose use case for request_id. + char* request_id = nullptr; + SCOPE_EXIT { + free(request_id); + };*/ + int ret = mc_client_send_repeat_mode_cmd(handle_, server_name.c_str(), + mode ? MC_REPEAT_MODE_ON : MC_REPEAT_MODE_OFF, + /*&request_id*/ nullptr); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { - return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Error sending repeat mode", - ("mc_client_send_repeat_mode_command() error: %d, message: %s", ret, - get_error_message(ret))); + return LogAndCreateResult( + ErrorCode::UNKNOWN_ERR, "Error sending repeat mode", + ("mc_client_send_repeat_mode_cmd() error: %d, message: %s", ret, get_error_message(ret))); } return PlatformResult(ErrorCode::NO_ERROR); diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc index 8cf93409..b2a3e83e 100644 --- a/src/mediacontroller/mediacontroller_server.cc +++ b/src/mediacontroller/mediacontroller_server.cc @@ -327,9 +327,9 @@ PlatformResult MediaControllerServer::SetChangeRequestPlaybackInfoListener( int (*unsetters[])(mc_server_h) = { mc_server_unset_playback_state_command_received_cb, - mc_server_unset_playback_position_command_received_cb, - mc_server_unset_shuffle_mode_command_received_cb, - /*mc_server_unset_repeat_mode_command_received_cb the last unsetter will never be used*/}; + mc_server_unset_playback_position_cmd_received_cb, + mc_server_unset_shuffle_mode_cmd_received_cb, + /*mc_server_unset_repeat_mode_cmd_received_cb the last unsetter will never be used*/}; // This loop is no-op in case of success. for (int i = 0; i < failed_setter; ++i) { @@ -348,32 +348,30 @@ PlatformResult MediaControllerServer::SetChangeRequestPlaybackInfoListener( get_error_message(ret))); } - ret = - mc_server_set_playback_position_command_received_cb(handle_, OnPlaybackPositionCommand, this); + ret = mc_server_set_playback_position_cmd_received_cb(handle_, OnPlaybackPositionCommand, this); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { failed_setter = 1; return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Unable to set playback position command listener", - ("mc_server_set_playback_state_command_received_cb() error: %d, message: %s", ret, + ("mc_server_set_playback_position_cmd_received_cb() error: %d, message: %s", ret, get_error_message(ret))); } - ret = mc_server_set_shuffle_mode_command_received_cb(handle_, OnShuffleModeCommand, this); + ret = mc_server_set_shuffle_mode_cmd_received_cb(handle_, OnShuffleModeCommand, this); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { failed_setter = 2; return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Unable to set shuffle mode command listener", - ("mc_server_set_shuffle_mode_command_received_cb() error: %d, message: %s", ret, + ("mc_server_set_shuffle_mode_cmd_received_cb() error: %d, message: %s", ret, get_error_message(ret))); } - ret = mc_server_set_repeat_mode_command_received_cb(handle_, OnRepeatModeCommand, this); + ret = mc_server_set_repeat_mode_cmd_received_cb(handle_, OnRepeatModeCommand, this); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { failed_setter = 3; - return LogAndCreateResult( - ErrorCode::UNKNOWN_ERR, "Unable to set repeat mode command listener", - ("mc_server_set_repeat_mode_command_received_cb() error: %d, message: %s", ret, - get_error_message(ret))); + return LogAndCreateResult(ErrorCode::UNKNOWN_ERR, "Unable to set repeat mode command listener", + ("mc_server_set_repeat_mode_cmd_received_cb() error: %d, message: %s", + ret, get_error_message(ret))); } change_request_playback_info_listener_ = callback; @@ -392,27 +390,27 @@ PlatformResult MediaControllerServer::UnsetChangeRequestPlaybackInfoListener() { get_error_message(ret))); } - ret = mc_server_unset_playback_position_command_received_cb(handle_); + ret = mc_server_unset_playback_position_cmd_received_cb(handle_); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Unable to unset playback position command listener", - ("mc_server_unset_playback_position_command_received_cb() error: %d, message: %s", ret, + ("mc_server_unset_playback_position_cmd_received_cb() error: %d, message: %s", ret, get_error_message(ret))); } - ret = mc_server_unset_shuffle_mode_command_received_cb(handle_); + ret = mc_server_unset_shuffle_mode_cmd_received_cb(handle_); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Unable to unset shuffle mode command listener", - ("mc_server_unset_shuffle_mode_command_received_cb() error: %d, message: %s", ret, + ("mc_server_unset_shuffle_mode_cmd_received_cb() error: %d, message: %s", ret, get_error_message(ret))); } - ret = mc_server_unset_repeat_mode_command_received_cb(handle_); + ret = mc_server_unset_repeat_mode_cmd_received_cb(handle_); if (MEDIA_CONTROLLER_ERROR_NONE != ret) { return LogAndCreateResult( ErrorCode::UNKNOWN_ERR, "Unable to unset repeat mode command listener", - ("mc_server_unset_repeat_mode_command_received_cb() error: %d, message: %s", ret, + ("mc_server_unset_repeat_mode_cmd_received_cb() error: %d, message: %s", ret, get_error_message(ret))); } @@ -450,6 +448,7 @@ void MediaControllerServer::OnPlaybackStateCommand(const char* client_name, } void MediaControllerServer::OnPlaybackPositionCommand(const char* client_name, + const char* request_id, unsigned long long position, void* user_data) { ScopeLogger(); @@ -470,8 +469,8 @@ void MediaControllerServer::OnPlaybackPositionCommand(const char* client_name, server->change_request_playback_info_listener_(&data); } -void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shuffle_mode_e mode, - void* user_data) { +void MediaControllerServer::OnShuffleModeCommand(const char* client_name, const char* request_id, + mc_shuffle_mode_e mode, void* user_data) { ScopeLogger(); MediaControllerServer* server = static_cast(user_data); @@ -490,8 +489,8 @@ void MediaControllerServer::OnShuffleModeCommand(const char* client_name, mc_shu server->change_request_playback_info_listener_(&data); } -void MediaControllerServer::OnRepeatModeCommand(const char* client_name, mc_repeat_mode_e mode, - void* user_data) { +void MediaControllerServer::OnRepeatModeCommand(const char* client_name, const char* request_id, + mc_repeat_mode_e mode, void* user_data) { ScopeLogger(); MediaControllerServer* server = static_cast(user_data); diff --git a/src/mediacontroller/mediacontroller_server.h b/src/mediacontroller/mediacontroller_server.h index b3085be3..2fc1803a 100644 --- a/src/mediacontroller/mediacontroller_server.h +++ b/src/mediacontroller/mediacontroller_server.h @@ -62,11 +62,12 @@ class MediaControllerServer { static void OnPlaybackStateCommand(const char* client_name, mc_playback_states_e state_e, void* user_data); - static void OnPlaybackPositionCommand(const char* client_name, unsigned long long position, - void* user_data); - static void OnShuffleModeCommand(const char* client_name, mc_shuffle_mode_e mode, - void* user_data); - static void OnRepeatModeCommand(const char* client_name, mc_repeat_mode_e mode, void* user_data); + static void OnPlaybackPositionCommand(const char* client_name, const char* request_id, + unsigned long long position, void* user_data); + static void OnShuffleModeCommand(const char* client_name, const char* request_id, + mc_shuffle_mode_e mode, void* user_data); + static void OnRepeatModeCommand(const char* client_name, const char* request_id, + mc_repeat_mode_e mode, void* user_data); static void OnCommandReceived(const char* client_name, const char* command, bundle* data, void* user_data);