[6.0][mediacontroller] add MediaControllerPlaylists interface

[acr]
http://suprem.sec.samsung.net/jira/browse/TWDAPI-247

[description]
>> refactor_04 <<
add MediaControllerPlaylists interface to MediaControllerServer.
Methods added to MediaControllerPlaylists interface:
+ createPlaylist
+ savePlaylist
+ deletePlaylist
+ getAllPlaylists

[verification]
tested manually in chrome console
tct-mediacontroller-tizen-tests fails with 2 TC:
- MediaControllerServer_iconURI_attribute.html <- has to be modified,
  because attribute iconURI is no longer readonly
- MediaControllerServerInfo_iconURI_attribute.html <- has to be modified,
  because attribute iconURI is no longer readonly

Change-Id: I4cd792eb6e87f1803bd3e56b54accc91f1e0fd8d
Signed-off-by: Dawid Juszczak <d.juszczak@samsung.com>

diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js
index f26d6e1..77e594e 100755 (executable)
--- a/src/mediacontroller/mediacontroller_api.js
+++ b/src/mediacontroller/mediacontroller_api.js
@@ -224,7 +224,7 @@ var ServerPlaybackInfoListener = new ListenerManager(
 
         if (!type_.isNullOrUndefined(reply)) {
             if (!(reply instanceof RequestReply)) {
-                reply = new RequestReply(reply,0);
+                reply = new RequestReply(reply, 0);
             }
 
             var nativeData = {
@@ -2246,6 +2246,10 @@ function MediaControllerServer(data) {
             },
             enumerable: true
         },
+        playlists: {
+            value: new MediaControllerPlaylists(),
+            enumerable: true
+        },
         abilities: {
             value: new MediaControllerAbilities(),
             enumerable: true
@@ -2576,12 +2580,20 @@ MediaControllerServer.prototype.removeCommandListener = function(watchId) {
 };
 
 MediaControllerServer.prototype.createPlaylist = function(name) {
+    utils_.printDeprecationWarningFor(
+        'MediaControllerServer.createPlaylist()',
+        'MediaControllerPlaylists.createPlaylist()'
+    );
+    return createPlaylist(name);
+};
+
+var createPlaylist = function() {
     var args = validator_.validateArgs(arguments, [
-        { name: 'name', type: types_.STRING }
+        { name: 'playlistName', type: types_.STRING }
     ]);
 
     var data = {
-        name: args.name
+        playlistName: args.playlistName
     };
 
     var result = native_.callSync('MediaControllerServerCreatePlaylist', data);
@@ -2598,6 +2610,14 @@ MediaControllerServer.prototype.savePlaylist = function(
     successCallback,
     errorCallback
 ) {
+    utils_.printDeprecationWarningFor(
+        'MediaControllerServer.savePlaylist()',
+        'MediaControllerPlaylists.savePlaylist()'
+    );
+    savePlaylist.apply(this, arguments);
+};
+
+var savePlaylist = function(playlist, successCallback, errorCallback) {
     var args = validator_.validateArgs(arguments, [
         {
             name: 'playlist',
@@ -2614,7 +2634,7 @@ MediaControllerServer.prototype.savePlaylist = function(
     ]);
 
     var data = {
-        name: args.playlist.name
+        playlistName: args.playlist.name
     };
 
     var callback = function(result) {
@@ -2633,12 +2653,20 @@ MediaControllerServer.prototype.savePlaylist = function(
 };
 
 MediaControllerServer.prototype.deletePlaylist = function(
-    name,
+    playlistName,
     successCallback,
     errorCallback
 ) {
+    utils_.printDeprecationWarningFor(
+        'MediaControllerServer.deletePlaylist()',
+        'MediaControllerPlaylists.deletePlaylist()'
+    );
+    deletePlaylist.apply(this, arguments);
+};
+
+var deletePlaylist = function(playlistName, successCallback, errorCallback) {
     var args = validator_.validateArgs(arguments, [
-        { name: 'name', type: types_.STRING },
+        { name: 'playlistName', type: types_.STRING },
         {
             name: 'successCallback',
             type: types_.FUNCTION,
@@ -2649,7 +2677,7 @@ MediaControllerServer.prototype.deletePlaylist = function(
     ]);
 
     var data = {
-        name: args.name
+        playlistName: args.playlistName
     };
 
     var callback = function(result) {
@@ -2701,6 +2729,14 @@ MediaControllerServer.prototype.getAllPlaylists = function(
     successCallback,
     errorCallback
 ) {
+    utils_.printDeprecationWarningFor(
+        'MediaControllerServer.getAllPlaylists()',
+        'MediaControllerPlaylists.getAllPlaylists()'
+    );
+    serverGetAllPlaylists.apply(this, arguments);
+};
+
+var serverGetAllPlaylists = function(successCallback, errorCallback) {
     var args = validator_.validateArgs(arguments, [
         {
             name: 'successCallback',
@@ -4324,6 +4360,35 @@ var sendRequestWithReply = function(
     ReplyCommandListener.requestIdToListenerId[replyListenerId] = result.requestId;
 };
 
+var MediaControllerPlaylists = function() {};
+
+MediaControllerPlaylists.prototype.createPlaylist = function(name) {
+    return createPlaylist.apply(this, arguments);
+};
+
+MediaControllerPlaylists.prototype.savePlaylist = function(
+    playlist,
+    successCallback,
+    errorCallback
+) {
+    savePlaylist.apply(this, arguments);
+};
+
+MediaControllerPlaylists.prototype.deletePlaylist = function(
+    playlistName,
+    successCallback,
+    errorCallback
+) {
+    deletePlaylist.apply(this, arguments);
+};
+
+MediaControllerPlaylists.prototype.getAllPlaylists = function(
+    successCallback,
+    errorCallback
+) {
+    serverGetAllPlaylists.apply(this, arguments);
+};
+
 exports = new MediaControllerManager();
 exports.SearchFilter = SearchFilter;
 exports.RequestReply = RequestReply;

diff --git a/src/mediacontroller/mediacontroller_instance.cc b/src/mediacontroller/mediacontroller_instance.cc
index c94f6d4..f5ac474 100644 (file)
--- a/src/mediacontroller/mediacontroller_instance.cc
+++ b/src/mediacontroller/mediacontroller_instance.cc
@@ -588,13 +588,13 @@ void MediaControllerInstance::MediaControllerServerCreatePlaylist(const picojson
     return;
   }
 
-  CHECK_ARGS(args, kName, std::string, out)
+  CHECK_ARGS(args, kPlaylistName, std::string, out)
 
   picojson::value playlist_info = picojson::value();
 
-  auto result = server_->CreatePlaylist(args.get(kName).get<std::string>(), &playlist_info);
+  auto result = server_->CreatePlaylist(args.get(kPlaylistName).get<std::string>(), &playlist_info);
   if (!result) {
-    LogAndReportError(result, &out, ("Failed: server_->CreatePlaylist["));
+    LogAndReportError(result, &out, ("Failed: server_->CreatePlaylist"));
     return;
   }
 
@@ -611,14 +611,14 @@ void MediaControllerInstance::MediaControllerServerSavePlaylist(const picojson::
   }
 
   CHECK_EXIST(args, kCallbackId, out)
-  CHECK_ARGS(args, kName, std::string, out)
+  CHECK_ARGS(args, kPlaylistName, std::string, out)
 
   auto save = [this, args]() -> void {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& response_obj = response.get<picojson::object>();
     response_obj[kCallbackId] = args.get(kCallbackId);
 
-    auto result = server_->SavePlaylist(args.get(kName).get<std::string>());
+    auto result = server_->SavePlaylist(args.get(kPlaylistName).get<std::string>());
 
     if (result) {
       ReportSuccess(response_obj);
@@ -644,14 +644,14 @@ void MediaControllerInstance::MediaControllerServerDeletePlaylist(const picojson
   }
 
   CHECK_EXIST(args, kCallbackId, out)
-  CHECK_ARGS(args, kName, std::string, out)
+  CHECK_ARGS(args, kPlaylistName, std::string, out)
 
   auto del = [this, args]() -> void {
     picojson::value response = picojson::value(picojson::object());
     picojson::object& response_obj = response.get<picojson::object>();
     response_obj[kCallbackId] = args.get(kCallbackId);
 
-    auto result = server_->DeletePlaylist(args.get(kName).get<std::string>());
+    auto result = server_->DeletePlaylist(args.get(kPlaylistName).get<std::string>());
 
     if (result) {
       ReportSuccess(response_obj);