From: Rafal Galka Date: Wed, 8 Apr 2015 14:37:56 +0000 (+0200) Subject: [MediaController] add module to build, reorder commands X-Git-Tag: submit/tizen_tv/20150603.064601~1^2~181 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=92c6e0e2350cb8f19d9704ee1328a0e91bb55729;p=platform%2Fcore%2Fapi%2Fwebapi-plugins.git [MediaController] add module to build, reorder commands [Verification] module should build and be available as tizen.mediaController Change-Id: I7d59dd22444b403edbd5f48a1d77258c1210dda5 --- diff --git a/packaging/webapi-plugins.spec b/packaging/webapi-plugins.spec index b0f15881..a73d0aae 100755 --- a/packaging/webapi-plugins.spec +++ b/packaging/webapi-plugins.spec @@ -35,6 +35,7 @@ Source0: %{name}-%{version}.tar.gz %define tizen_feature_exif_support 1 %define tizen_feature_filesystem_support 1 %define tizen_feature_fm_radio_support 0 +%define tizen_feature_media_controller_support 1 %define tizen_feature_media_key_support 1 %define tizen_feature_message_port_support 1 %define tizen_feature_messaging_support 1 @@ -83,6 +84,7 @@ Source0: %{name}-%{version}.tar.gz %define tizen_feature_exif_support 0 %define tizen_feature_filesystem_support 0 %define tizen_feature_fm_radio_support 0 +%define tizen_feature_media_controller_support 0 %define tizen_feature_media_key_support 0 %define tizen_feature_message_port_support 0 %define tizen_feature_messaging_support 0 @@ -131,6 +133,7 @@ Source0: %{name}-%{version}.tar.gz %define tizen_feature_exif_support 1 %define tizen_feature_filesystem_support 1 %define tizen_feature_fm_radio_support 0 +%define tizen_feature_media_controller_support 0 %define tizen_feature_media_key_support 0 %define tizen_feature_message_port_support 1 %define tizen_feature_messaging_support 0 @@ -228,6 +231,10 @@ BuildRequires: pkgconfig(capi-appfw-application) BuildRequires: pkgconfig(push) %endif +%if 0%{?tizen_feature_media_controller_support} +BuildRequires: pkgconfig(capi-media-controller) +%endif + %if 0%{?tizen_feature_messaging_support} BuildRequires: pkgconfig(ecore-file) BuildRequires: pkgconfig(email-service) @@ -330,6 +337,7 @@ GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_download_support=%{?tizen_feature_down GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_exif_support=%{?tizen_feature_exif_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_filesystem_support=%{?tizen_feature_filesystem_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_fm_radio_support=%{?tizen_feature_fm_radio_support}" +GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_media_controller_support=%{?tizen_feature_media_controller_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_media_key_support=%{?tizen_feature_media_key_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_message_port_support=%{?tizen_feature_message_port_support}" GYP_OPTIONS="$GYP_OPTIONS -Dtizen_feature_messaging_support=%{?tizen_feature_messaging_support}" diff --git a/src/mediacontroller/mediacontroller.gyp b/src/mediacontroller/mediacontroller.gyp index 77f43651..8f6bb125 100755 --- a/src/mediacontroller/mediacontroller.gyp +++ b/src/mediacontroller/mediacontroller.gyp @@ -20,7 +20,7 @@ ['tizen == 1', { 'variables': { 'packages': [ - 'dlog', + 'capi-media-controller', ] }, }], diff --git a/src/mediacontroller/mediacontroller_extension.cc b/src/mediacontroller/mediacontroller_extension.cc index 4f15a49a..b57be061 100644 --- a/src/mediacontroller/mediacontroller_extension.cc +++ b/src/mediacontroller/mediacontroller_extension.cc @@ -10,21 +10,16 @@ extern const char kSource_mediacontroller_api[]; common::Extension* CreateExtension() { - return new MediacontrollerExtension; + return new MediaControllerExtension; } -MediacontrollerExtension::MediacontrollerExtension() { - SetExtensionName("tizen.mediaController"); +MediaControllerExtension::MediaControllerExtension() { + SetExtensionName("tizen.mediacontroller"); SetJavaScriptAPI(kSource_mediacontroller_api); - - const char* entry_points[] = { - NULL - }; - SetExtraJSEntryPoints(entry_points); } -MediacontrollerExtension::~MediacontrollerExtension() {} +MediaControllerExtension::~MediaControllerExtension() {} -common::Instance* MediacontrollerExtension::CreateInstance() { - return new extension::mediacontroller::MediacontrollerInstance; -} \ No newline at end of file +common::Instance* MediaControllerExtension::CreateInstance() { + return new extension::mediacontroller::MediaControllerInstance; +} diff --git a/src/mediacontroller/mediacontroller_extension.h b/src/mediacontroller/mediacontroller_extension.h index e0c5d8bf..a6968c4a 100644 --- a/src/mediacontroller/mediacontroller_extension.h +++ b/src/mediacontroller/mediacontroller_extension.h @@ -7,13 +7,13 @@ #include "common/extension.h" -class MediacontrollerExtension : public common::Extension { +class MediaControllerExtension : public common::Extension { public: - MediacontrollerExtension(); - virtual ~MediacontrollerExtension(); + MediaControllerExtension(); + virtual ~MediaControllerExtension(); private: virtual common::Instance* CreateInstance(); }; -#endif // MEDIACONTROLLER_MEDIACONTROLLER_EXTENSION_H_ +#endif // MEDIACONTROLLER_MEDIACONTROLLER_EXTENSION_H_ diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc index 743851ad..0d87054c 100644 --- a/src/mediacontroller/mediacontroller_instance.cc +++ b/src/mediacontroller/mediacontroller_instance.cc @@ -6,331 +6,247 @@ #include -#include "common/picojson.h" #include "common/logger.h" -#include "common/platform_exception.h" +#include "common/picojson.h" +#include "common/platform_result.h" namespace extension { namespace mediacontroller { namespace { -// The privileges that required in Mediacontroller API -const std::string kPrivilegeMediacontroller = ""; +// The privileges required in MediaController API +const std::string kPrivilegeMediaControllerClient = + "http://tizen.org/privilege/mediacontroller.client"; +const std::string kPrivilegeMediaControllerServer = + "http://tizen.org/privilege/mediacontroller.server"; } // namespace -using namespace common; -using namespace extension::mediacontroller; +using common::PlatformResult; +using common::ErrorCode; -MediacontrollerInstance::MediacontrollerInstance() { +MediaControllerInstance::MediaControllerInstance() { using namespace std::placeholders; - #define REGISTER_SYNC(c,x) \ - RegisterSyncHandler(c, std::bind(&MediacontrollerInstance::x, this, _1, _2)); - REGISTER_SYNC("MediaControllerServerInfo_sendCommand", MediaControllerServerInfoSendCommand); - REGISTER_SYNC("MediaControllerServer_updatePlaybackState", MediaControllerServerUpdatePlaybackState); - REGISTER_SYNC("MediaControllerServer_updateRepeatMode", MediaControllerServerUpdateRepeatMode); - REGISTER_SYNC("MediaControllerManager_createServer", MediaControllerManagerCreateServer); - REGISTER_SYNC("MediaControllerServer_addCommandListener", MediaControllerServerAddCommandListener); - REGISTER_SYNC("MediaControllerServerInfo_removePlaybackInfoChangeListener", MediaControllerServerInfoRemovePlaybackInfoChangeListener); - REGISTER_SYNC("MediaControllerServer_updatePlaybackPosition", MediaControllerServerUpdatePlaybackPosition); - REGISTER_SYNC("MediaControllerServer_updateShuffleMode", MediaControllerServerUpdateShuffleMode); - REGISTER_SYNC("MediaControllerServerInfo_sendPlaybackPosition", MediaControllerServerInfoSendPlaybackPosition); - REGISTER_SYNC("MediaControllerServerInfo_addPlaybackInfoChangeListener", MediaControllerServerInfoAddPlaybackInfoChangeListener); - REGISTER_SYNC("MediaControllerServer_addChangeRequestPlaybackInfoListener", MediaControllerServerAddChangeRequestPlaybackInfoListener); - REGISTER_SYNC("MediaControllerServerInfo_sendPlaybackState", MediaControllerServerInfoSendPlaybackState); - REGISTER_SYNC("MediaControllerClient_findServers", MediaControllerClientFindServers); - REGISTER_SYNC("MediaControllerServerInfo_addServerStatusChangeListener", MediaControllerServerInfoAddServerStatusChangeListener); - REGISTER_SYNC("MediaControllerServer_removeChangeRequestPlaybackInfoListener", MediaControllerServerRemoveChangeRequestPlaybackInfoListener); - REGISTER_SYNC("MediaControllerServer_removeCommandListener", MediaControllerServerRemoveCommandListener); - REGISTER_SYNC("MediaControllerServerInfo_sendShuffleMode", MediaControllerServerInfoSendShuffleMode); - REGISTER_SYNC("MediaControllerServerInfo_removeServerStatusChangeListener", MediaControllerServerInfoRemoveServerStatusChangeListener); - REGISTER_SYNC("MediaControllerServer_updateMetadata", MediaControllerServerUpdateMetadata); - REGISTER_SYNC("MediaControllerClient_getLatestServerInfo", MediaControllerClientGetLatestServerInfo); - REGISTER_SYNC("MediaControllerManager_getClient", MediaControllerManagerGetClient); - REGISTER_SYNC("MediaControllerServerInfo_sendRepeatMode", MediaControllerServerInfoSendRepeatMode); - #undef REGISTER_SYNC -} -MediacontrollerInstance::~MediacontrollerInstance() { +#define REGISTER_SYNC(c, x) \ + RegisterSyncHandler(c, std::bind(&MediaControllerInstance::x, this, _1, _2)); +#define REGISTER_ASYNC(c, x) \ + RegisterSyncHandler(c, std::bind(&MediaControllerInstance::x, this, _1, _2)); + + // server + REGISTER_SYNC("MediaControllerManager_createServer", + MediaControllerManagerCreateServer); + REGISTER_SYNC("MediaControllerServer_updatePlaybackState", + MediaControllerServerUpdatePlaybackState); + REGISTER_SYNC("MediaControllerServer_updatePlaybackPosition", + MediaControllerServerUpdatePlaybackPosition); + REGISTER_SYNC("MediaControllerServer_updateRepeatMode", + MediaControllerServerUpdateRepeatMode); + REGISTER_SYNC("MediaControllerServer_updateShuffleMode", + MediaControllerServerUpdateShuffleMode); + REGISTER_SYNC("MediaControllerServer_updateMetadata", + MediaControllerServerUpdateMetadata); + REGISTER_SYNC("MediaControllerServer_addChangeRequestPlaybackInfoListener", + MediaControllerServerAddChangeRequestPlaybackInfoListener); + REGISTER_SYNC("MediaControllerServer_removeChangeRequestPlaybackInfoListener", + MediaControllerServerRemoveChangeRequestPlaybackInfoListener); + REGISTER_SYNC("MediaControllerServer_addCommandListener", + MediaControllerServerAddCommandListener); + REGISTER_SYNC("MediaControllerServer_removeCommandListener", + MediaControllerServerRemoveCommandListener); + + // client + REGISTER_SYNC("MediaControllerManager_getClient", + MediaControllerManagerGetClient); + REGISTER_ASYNC("MediaControllerClient_findServers", + MediaControllerClientFindServers); + REGISTER_SYNC("MediaControllerClient_getLatestServerInfo", + MediaControllerClientGetLatestServerInfo); + REGISTER_SYNC("MediaControllerServerInfo_sendPlaybackState", + MediaControllerServerInfoSendPlaybackState); + REGISTER_ASYNC("MediaControllerServerInfo_sendPlaybackPosition", + MediaControllerServerInfoSendPlaybackPosition); + REGISTER_ASYNC("MediaControllerServerInfo_sendRepeatMode", + MediaControllerServerInfoSendRepeatMode); + REGISTER_ASYNC("MediaControllerServerInfo_sendShuffleMode", + MediaControllerServerInfoSendShuffleMode); + REGISTER_ASYNC("MediaControllerServerInfo_sendCommand", + MediaControllerServerInfoSendCommand); + REGISTER_SYNC("MediaControllerServerInfo_addServerStatusChangeListener", + MediaControllerServerInfoAddServerStatusChangeListener); + REGISTER_SYNC("MediaControllerServerInfo_removeServerStatusChangeListener", + MediaControllerServerInfoRemoveServerStatusChangeListener); + REGISTER_SYNC("MediaControllerServerInfo_addPlaybackInfoChangeListener", + MediaControllerServerInfoAddPlaybackInfoChangeListener); + REGISTER_SYNC("MediaControllerServerInfo_removePlaybackInfoChangeListener", + MediaControllerServerInfoRemovePlaybackInfoChangeListener); + +#undef REGISTER_SYNC +#undef REGISTER_ASYNC } - -enum MediacontrollerCallbacks { - MediaControllerServerInfoSendCommandCallback, - MediaControllerServerUpdatePlaybackStateCallback, - MediaControllerServerUpdateRepeatModeCallback, - MediaControllerManagerCreateServerCallback, - MediaControllerServerAddCommandListenerCallback, - MediaControllerServerInfoRemovePlaybackInfoChangeListenerCallback, - MediaControllerServerUpdatePlaybackPositionCallback, - MediaControllerServerUpdateShuffleModeCallback, - MediaControllerServerInfoSendPlaybackPositionCallback, - MediaControllerServerInfoAddPlaybackInfoChangeListenerCallback, - MediaControllerServerAddChangeRequestPlaybackInfoListenerCallback, - MediaControllerServerInfoSendPlaybackStateCallback, - MediaControllerClientFindServersCallback, - MediaControllerServerInfoAddServerStatusChangeListenerCallback, - MediaControllerServerRemoveChangeRequestPlaybackInfoListenerCallback, - MediaControllerServerRemoveCommandListenerCallback, - MediaControllerServerInfoSendShuffleModeCallback, - MediaControllerServerInfoRemoveServerStatusChangeListenerCallback, - MediaControllerServerUpdateMetadataCallback, - MediaControllerClientGetLatestServerInfoCallback, - MediaControllerManagerGetClientCallback, - MediaControllerServerInfoSendRepeatModeCallback -}; - -static void ReplyAsync(MediacontrollerInstance* instance, MediacontrollerCallbacks cbfunc, - int callbackId, bool isSuccess, picojson::object& param) { - param["callbackId"] = picojson::value(static_cast(callbackId)); - param["status"] = picojson::value(isSuccess ? "success" : "error"); - - // insert result for async callback to param - switch(cbfunc) { - case MediaControllerManagerGetClientCallback: { - // do something... - break; - } - case MediaControllerManagerCreateServerCallback: { - // do something... - break; - } - case MediaControllerServerUpdatePlaybackStateCallback: { - // do something... - break; - } - case MediaControllerServerUpdatePlaybackPositionCallback: { - // do something... - break; - } - case MediaControllerServerUpdateShuffleModeCallback: { - // do something... - break; - } - case MediaControllerServerUpdateRepeatModeCallback: { - // do something... - break; - } - case MediaControllerServerUpdateMetadataCallback: { - // do something... - break; - } - case MediaControllerServerAddChangeRequestPlaybackInfoListenerCallback: { - // do something... - break; - } - case MediaControllerServerRemoveChangeRequestPlaybackInfoListenerCallback: { - // do something... - break; - } - case MediaControllerServerAddCommandListenerCallback: { - // do something... - break; - } - case MediaControllerServerRemoveCommandListenerCallback: { - // do something... - break; - } - case MediaControllerClientFindServersCallback: { - // do something... - break; - } - case MediaControllerClientGetLatestServerInfoCallback: { - // do something... - break; - } - case MediaControllerServerInfoSendPlaybackStateCallback: { - // do something... - break; - } - case MediaControllerServerInfoSendPlaybackPositionCallback: { - // do something... - break; - } - case MediaControllerServerInfoSendShuffleModeCallback: { - // do something... - break; - } - case MediaControllerServerInfoSendRepeatModeCallback: { - // do something... - break; - } - case MediaControllerServerInfoSendCommandCallback: { - // do something... - break; - } - case MediaControllerServerInfoAddServerStatusChangeListenerCallback: { - // do something... - break; - } - case MediaControllerServerInfoRemoveServerStatusChangeListenerCallback: { - // do something... - break; - } - case MediaControllerServerInfoAddPlaybackInfoChangeListenerCallback: { - // do something... - break; - } - case MediaControllerServerInfoRemovePlaybackInfoChangeListenerCallback: { - // do something... - break; - } - default: { - LoggerE("Invalid Callback Type"); - return; - } - } - - picojson::value result = picojson::value(param); - - instance->PostMessage(result.serialize().c_str()); +MediaControllerInstance::~MediaControllerInstance() { } #define CHECK_EXIST(args, name, out) \ - if (!args.contains(name)) {\ - ReportError(TypeMismatchException(name" is required argument"), out);\ - return;\ + if (!args.contains(name)) { \ + ReportError(PlatformResult(ErrorCode::TYPE_MISMATCH_ERR, \ + name" is required argument"), &out); \ + return; \ } -void MediacontrollerInstance::MediaControllerManagerGetClient(const picojson::value& args, picojson::object& out) { - +void MediaControllerInstance::MediaControllerManagerCreateServer( + const picojson::value& args, + picojson::object& out) { // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerManagerCreateServer(const picojson::value& args, picojson::object& out) { +void MediaControllerInstance::MediaControllerServerUpdatePlaybackState( + const picojson::value& args, + picojson::object& out) { // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerUpdatePlaybackState(const picojson::value& args, picojson::object& out) { - - // implement it - - - // if success - // ReportSuccess(out); - // if error - // ReportError(out); -} -void MediacontrollerInstance::MediaControllerServerUpdatePlaybackPosition(const picojson::value& args, picojson::object& out) { +void MediaControllerInstance::MediaControllerServerUpdatePlaybackPosition( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "position", out) double position = args.get("position").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerUpdateShuffleMode(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerUpdateShuffleMode( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "mode", out) bool mode = args.get("mode").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerUpdateRepeatMode(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerUpdateRepeatMode( + const picojson::value& args, + picojson::object& out) { + CHECK_EXIST(args, "mode", out) bool mode = args.get("mode").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerUpdateMetadata(const picojson::value& args, picojson::object& out) { +void MediaControllerInstance::MediaControllerServerUpdateMetadata( + const picojson::value& args, + picojson::object& out) { // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerAddChangeRequestPlaybackInfoListener(const picojson::value& args, picojson::object& out) { - CHECK_EXIST(args, "callbackId", out) - int callbackId = static_cast(args.get("callbackId").get()); +void MediaControllerInstance::MediaControllerServerAddChangeRequestPlaybackInfoListener( + const picojson::value& args, + picojson::object& out) { // implement it - // call ReplyAsync in later (Asynchronously) - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerRemoveChangeRequestPlaybackInfoListener(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerRemoveChangeRequestPlaybackInfoListener( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "watchId", out) double watchId = args.get("watchId").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerAddCommandListener(const picojson::value& args, picojson::object& out) { - CHECK_EXIST(args, "callbackId", out) - int callbackId = static_cast(args.get("callbackId").get()); +void MediaControllerInstance::MediaControllerServerAddCommandListener( + const picojson::value& args, + picojson::object& out) { // implement it - // call ReplyAsync in later (Asynchronously) - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerRemoveCommandListener(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerRemoveCommandListener( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "watchId", out) double watchId = args.get("watchId").get(); // implement it + // if success + // ReportSuccess(out); + // if error + // ReportError(out); +} + +void MediaControllerInstance::MediaControllerManagerGetClient( + const picojson::value& args, + picojson::object& out) { + + // implement it // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerClientFindServers(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerClientFindServers( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) int callbackId = static_cast(args.get("callbackId").get()); @@ -344,18 +260,22 @@ void MediacontrollerInstance::MediaControllerClientFindServers(const picojson::v // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerClientGetLatestServerInfo(const picojson::value& args, picojson::object& out) { +void MediaControllerInstance::MediaControllerClientGetLatestServerInfo( + const picojson::value& args, + picojson::object& out) { // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoSendPlaybackState(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoSendPlaybackState( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) int callbackId = static_cast(args.get("callbackId").get()); @@ -369,7 +289,10 @@ void MediacontrollerInstance::MediaControllerServerInfoSendPlaybackState(const p // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoSendPlaybackPosition(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoSendPlaybackPosition( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "position", out) @@ -385,7 +308,10 @@ void MediacontrollerInstance::MediaControllerServerInfoSendPlaybackPosition(cons // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoSendShuffleMode(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoSendShuffleMode( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "mode", out) @@ -401,7 +327,10 @@ void MediacontrollerInstance::MediaControllerServerInfoSendShuffleMode(const pic // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoSendRepeatMode(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoSendRepeatMode( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "mode", out) @@ -417,7 +346,10 @@ void MediacontrollerInstance::MediaControllerServerInfoSendRepeatMode(const pico // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoSendCommand(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoSendCommand( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "callbackId", out) CHECK_EXIST(args, "command", out) CHECK_EXIST(args, "data", out) @@ -435,63 +367,62 @@ void MediacontrollerInstance::MediaControllerServerInfoSendCommand(const picojso // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoAddServerStatusChangeListener(const picojson::value& args, picojson::object& out) { - CHECK_EXIST(args, "callbackId", out) - int callbackId = static_cast(args.get("callbackId").get()); +void MediaControllerInstance::MediaControllerServerInfoAddServerStatusChangeListener( + const picojson::value& args, + picojson::object& out) { // implement it - // call ReplyAsync in later (Asynchronously) - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoRemoveServerStatusChangeListener(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoRemoveServerStatusChangeListener( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "watchId", out) double watchId = args.get("watchId").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoAddPlaybackInfoChangeListener(const picojson::value& args, picojson::object& out) { - CHECK_EXIST(args, "callbackId", out) - int callbackId = static_cast(args.get("callbackId").get()); +void MediaControllerInstance::MediaControllerServerInfoAddPlaybackInfoChangeListener( + const picojson::value& args, + picojson::object& out) { // implement it - // call ReplyAsync in later (Asynchronously) - // if success // ReportSuccess(out); // if error // ReportError(out); } -void MediacontrollerInstance::MediaControllerServerInfoRemovePlaybackInfoChangeListener(const picojson::value& args, picojson::object& out) { + +void MediaControllerInstance::MediaControllerServerInfoRemovePlaybackInfoChangeListener( + const picojson::value& args, + picojson::object& out) { CHECK_EXIST(args, "watchId", out) double watchId = args.get("watchId").get(); // implement it - // if success // ReportSuccess(out); // if error // ReportError(out); } - #undef CHECK_EXIST } // namespace mediacontroller -} // namespace extension \ No newline at end of file +} // namespace extension diff --git a/src/mediacontroller/mediacontroller_instance.h b/src/mediacontroller/mediacontroller_instance.h index 2bbec411..2c62ed12 100644 --- a/src/mediacontroller/mediacontroller_instance.h +++ b/src/mediacontroller/mediacontroller_instance.h @@ -10,37 +10,40 @@ namespace extension { namespace mediacontroller { -class MediacontrollerInstance : public common::ParsedInstance { +class MediaControllerInstance : public common::ParsedInstance { public: - MediacontrollerInstance(); - virtual ~MediacontrollerInstance(); + MediaControllerInstance(); + virtual ~MediaControllerInstance(); private: - void MediaControllerServerInfoSendCommand(const picojson::value& args, picojson::object& out); - void MediaControllerServerUpdatePlaybackState(const picojson::value& args, picojson::object& out); - void MediaControllerServerUpdateRepeatMode(const picojson::value& args, picojson::object& out); + // server void MediaControllerManagerCreateServer(const picojson::value& args, picojson::object& out); - void MediaControllerServerAddCommandListener(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoRemovePlaybackInfoChangeListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerUpdatePlaybackState(const picojson::value& args, picojson::object& out); void MediaControllerServerUpdatePlaybackPosition(const picojson::value& args, picojson::object& out); + void MediaControllerServerUpdateRepeatMode(const picojson::value& args, picojson::object& out); void MediaControllerServerUpdateShuffleMode(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoSendPlaybackPosition(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoAddPlaybackInfoChangeListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerUpdateMetadata(const picojson::value& args, picojson::object& out); void MediaControllerServerAddChangeRequestPlaybackInfoListener(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoSendPlaybackState(const picojson::value& args, picojson::object& out); - void MediaControllerClientFindServers(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoAddServerStatusChangeListener(const picojson::value& args, picojson::object& out); void MediaControllerServerRemoveChangeRequestPlaybackInfoListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerAddCommandListener(const picojson::value& args, picojson::object& out); void MediaControllerServerRemoveCommandListener(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoSendShuffleMode(const picojson::value& args, picojson::object& out); - void MediaControllerServerInfoRemoveServerStatusChangeListener(const picojson::value& args, picojson::object& out); - void MediaControllerServerUpdateMetadata(const picojson::value& args, picojson::object& out); - void MediaControllerClientGetLatestServerInfo(const picojson::value& args, picojson::object& out); + + // client void MediaControllerManagerGetClient(const picojson::value& args, picojson::object& out); + void MediaControllerClientFindServers(const picojson::value& args, picojson::object& out); + void MediaControllerClientGetLatestServerInfo(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoSendPlaybackState(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoSendPlaybackPosition(const picojson::value& args, picojson::object& out); void MediaControllerServerInfoSendRepeatMode(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoSendShuffleMode(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoSendCommand(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoAddServerStatusChangeListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoRemoveServerStatusChangeListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoAddPlaybackInfoChangeListener(const picojson::value& args, picojson::object& out); + void MediaControllerServerInfoRemovePlaybackInfoChangeListener(const picojson::value& args, picojson::object& out); }; } // namespace mediacontroller } // namespace extension -#endif // MEDIACONTROLLER_MEDIACONTROLLER_INSTANCE_H_ \ No newline at end of file +#endif // MEDIACONTROLLER_MEDIACONTROLLER_INSTANCE_H_ diff --git a/src/tizen-wrt.gyp b/src/tizen-wrt.gyp index 0c73f5d7..1cc576b0 100755 --- a/src/tizen-wrt.gyp +++ b/src/tizen-wrt.gyp @@ -132,6 +132,13 @@ ], }, ], + [ + 'tizen_feature_media_controller_support==1', { + 'dependencies': [ + 'mediacontroller/mediacontroller.gyp:*', + ], + }, + ], [ 'tizen_feature_media_key_support==1', { 'dependencies': [