[Mediacontroller] Prepared templates for new features

This commit is prepared as a parent for several features introduced with
related native ACR http://suprem.sec.samsung.net/jira/browse/ACR-1444

Related ACRs:
http://suprem.sec.samsung.net/jira/browse/TWDAPI-229
http://suprem.sec.samsung.net/jira/browse/TWDAPI-230
http://suprem.sec.samsung.net/jira/browse/TWDAPI-231
http://suprem.sec.samsung.net/jira/browse/TWDAPI-232

Change-Id: Id23a4b53a5f9b9232224f942a2bde18940680abf

diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js
index 05f98a2..1766ee9 100755 (executable)
--- a/src/mediacontroller/mediacontroller_api.js
+++ b/src/mediacontroller/mediacontroller_api.js
@@ -951,6 +951,19 @@ var MediaControllerPlaybackAbilitiesInfo = function(serverName) {
     });
 };
 
+// TODO subtitles
+var MediaControllerSubtitles = function() {};
+var MediaControllerSubtitlesInfo = function() {};
+// TODO mode360
+var MediaControllerMode360 = function() {};
+var MediaControllerMode360Info = function() {};
+// TODO displayMode
+var MediaControllerDisplayMode = function() {};
+var MediaControllerDisplayModeInfo = function() {};
+// TODO displayRotation
+var MediaControllerDisplayRotation = function() {};
+var MediaControllerDisplayRotationInfo = function() {};
+
 function MediaControllerServer(data) {
     var _iconURI = null;
 
@@ -972,6 +985,22 @@ function MediaControllerServer(data) {
         abilities: {
             value: new MediaControllerAbilities(),
             enumerable: true
+        },
+        subtitles: {
+            value: new MediaControllerSubtitles(),
+            enumerable: true
+        },
+        mode360: {
+            value: new MediaControllerMode360(),
+            enumerable: true
+        },
+        displayMode: {
+            value: new MediaControllerDisplayMode(),
+            enumerable: true
+        },
+        displayRotation: {
+            value: new MediaControllerDisplayRotation(),
+            enumerable: true
         }
     });
 }
@@ -1845,6 +1874,26 @@ function MediaControllerServerInfo(data) {
             value: new MediaControllerAbilitiesInfo(data.name),
             enumerable: true,
             writable: false
+        },
+        subtitles: {
+            value: new MediaControllerSubtitlesInfo(),
+            enumerable: true,
+            writable: false
+        },
+        mode360: {
+            value: new MediaControllerMode360Info(),
+            enumerable: true,
+            writable: false
+        },
+        displayMode: {
+            value: new MediaControllerDisplayModeInfo(),
+            enumerable: true,
+            writable: false
+        },
+        displayRotation: {
+            value: new MediaControllerDisplayRotationInfo(),
+            enumerable: true,
+            writable: false
         }
     });
 }

diff --git a/src/mediacontroller/mediacontroller_client.cc b/src/mediacontroller/mediacontroller_client.cc
index 7cf7cf3..3fb8fe5 100644 (file)
--- a/src/mediacontroller/mediacontroller_client.cc
+++ b/src/mediacontroller/mediacontroller_client.cc
@@ -1156,5 +1156,10 @@ PlatformResult MediaControllerClient::UnsetPlaylistUpdateListener() {
   return PlatformResult(ErrorCode::NO_ERROR);
 }
 
+// TODO subtitles
+// TODO mode360
+// TODO displayMode
+// TODO displayRotation
+
 }  // namespace mediacontroller
 }  // namespace extension

diff --git a/src/mediacontroller/mediacontroller_client.h b/src/mediacontroller/mediacontroller_client.h
index e9dd2b5..50c7744 100644 (file)
--- a/src/mediacontroller/mediacontroller_client.h
+++ b/src/mediacontroller/mediacontroller_client.h
@@ -73,6 +73,10 @@ class MediaControllerClient {
   common::PlatformResult SubscribeServer(const std::string& server_name);
   common::PlatformResult UnsubscribeServer(const std::string& server_name);
   common::PlatformResult FindSubscribedServers(picojson::array* servers);
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
 
  private:
   mc_client_h handle_;
@@ -101,6 +105,10 @@ class MediaControllerClient {
                                       void* user_data);
   static void OnSimpleAbilityUpdate(const char* server_name, mc_ability_e type,
                                     mc_ability_support_e mode, void* user_data);
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
 };
 
 }  // namespace mediacontroller

diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index 6559f82..7dd0705 100644 (file)
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -35,6 +35,10 @@ const std::string kPrivilegeMediaControllerClient =
     "http://tizen.org/privilege/mediacontroller.client";
 const std::string kPrivilegeMediaControllerServer =
     "http://tizen.org/privilege/mediacontroller.server";
+  // TODO subtitles const
+  // TODO mode360 const
+  // TODO displayMode const
+  // TODO displayRotation const
 
 const char* kAbilityType = "abilityType";
 const char* kServerName = "serverName";
@@ -148,6 +152,11 @@ MediaControllerInstance::MediaControllerInstance() {
   REGISTER_SYNC("MediaControllerPlaylist_addItem", MediaControllerPlaylistAddItem);
   REGISTER_ASYNC("MediaControllerPlaylist_getItems", MediaControllerPlaylistGetItems);
 
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
+
 #undef REGISTER_SYNC
 #undef REGISTER_ASYNC
 }
@@ -1576,6 +1585,11 @@ void MediaControllerInstance::MediaControllerPlaylistGetItems(const picojson::va
   ReportSuccess(out);
 }
 
+// TODO subtitles
+// TODO mode360
+// TODO displayMode
+// TODO displayRotation
+
 #undef CHECK_EXIST
 
 }  // namespace mediacontroller

diff --git a/src/mediacontroller/mediacontroller_instance.h b/src/mediacontroller/mediacontroller_instance.h
index 66b081f..c925431 100644 (file)
--- a/src/mediacontroller/mediacontroller_instance.h
+++ b/src/mediacontroller/mediacontroller_instance.h
@@ -119,6 +119,11 @@ class MediaControllerInstance : public common::ParsedInstance {
   void MediaControllerPlaylistAddItem(const picojson::value& args, picojson::object& out);
   void MediaControllerPlaylistGetItems(const picojson::value& args, picojson::object& out);
 
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
+
   std::shared_ptr<MediaControllerClient> client_;
   std::shared_ptr<MediaControllerServer> server_;
 };

diff --git a/src/mediacontroller/mediacontroller_server.cc b/src/mediacontroller/mediacontroller_server.cc
index fb913d5..9f1a86b 100644 (file)
--- a/src/mediacontroller/mediacontroller_server.cc
+++ b/src/mediacontroller/mediacontroller_server.cc
@@ -1047,5 +1047,10 @@ void MediaControllerServer::OnPlaybackItemCommand(const char* client_name, const
   server->change_request_playback_info_listener_(&data);
 }
 
+// TODO subtitles
+// TODO mode360
+// TODO displayMode
+// TODO displayRotation
+
 }  // namespace mediacontroller
 }  // namespace extension

diff --git a/src/mediacontroller/mediacontroller_server.h b/src/mediacontroller/mediacontroller_server.h
index 2de7696..3889682 100644 (file)
--- a/src/mediacontroller/mediacontroller_server.h
+++ b/src/mediacontroller/mediacontroller_server.h
@@ -206,7 +206,10 @@ class MediaControllerServer {
   common::PlatformResult SavePlaybackAbilities(const picojson::value& abilities);
   common::PlatformResult SetSimpleAbility(const std::string& ability_type,
                                           const std::string& support_str);
-
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
  private:
   mc_server_h handle_;
 
@@ -243,6 +246,10 @@ class MediaControllerServer {
                                       mc_search_h request, void* user_data);
   static void OnCommandReceived(const char* client_name, const char* request_id,
                                 const char* command, bundle* data, void* user_data);
+  // TODO subtitles
+  // TODO mode360
+  // TODO displayMode
+  // TODO displayRotation
 };
 
 }  // namespace mediacontroller