Merge remote-tracking branch 'origin/tizen_3.0' into tizen_4.0

[platform/core/api/webapi-plugins.git] / src / mediacontroller / mediacontroller_api.js

diff --git a/src/mediacontroller/mediacontroller_api.js b/src/mediacontroller/mediacontroller_api.js
index 04ca640..be155e5 100755 (executable)
--- a/src/mediacontroller/mediacontroller_api.js
+++ b/src/mediacontroller/mediacontroller_api.js
@@ -23,15 +23,6 @@ var validator_ = utils_.validator;
 var types_ = validator_.Types;
 var native_ = new xwalk.utils.NativeManager(extension);
 
-// TODO(r.galka) CAPI have no dedicated methods for position/shuffle/repeat change.
-// It should be updated when new version of CAPI will be available.
-// For now implementation is using internal commands.
-var internal_commands_ = {
-    sendPlaybackPosition: '__internal_sendPlaybackPosition',
-    sendShuffleMode: '__internal_sendShuffleMode',
-    sendRepeatMode: '__internal_sendRepeatMode'
-};
-
 function ListenerManager(native, listenerName, handle) {
     this.listeners = {};
     this.listenerNameToIds = {};
@@ -724,12 +715,7 @@ MediaControllerServerInfo.prototype.sendPlaybackState = function(
             optional: true,
             nullable: true
         },
-        {
-            name: 'errorCallback',
-            type: types_.FUNCTION,
-            optional: true,
-            nullable: true
-        }
+        { name: 'errorCallback', type: types_.FUNCTION, optional: true, nullable: true }
     ]);
 
     var data = {
@@ -777,15 +763,11 @@ MediaControllerServerInfo.prototype.sendPlaybackPosition = function(
     };
 
     var data = {
-        position: args.position
+        position: args.position,
+        name: this.name
     };
 
-    sendDefinedCommand(
-        this.name,
-        internal_commands_.sendPlaybackPosition,
-        data,
-        callback
-    );
+    native_.call('MediaControllerServerInfo_sendPlaybackPosition', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendShuffleMode = function(
@@ -813,9 +795,10 @@ MediaControllerServerInfo.prototype.sendShuffleMode = function(
     };
 
     var data = {
-        mode: args.mode
+        mode: args.mode,
+        name: this.name
     };
-    sendDefinedCommand(this.name, internal_commands_.sendShuffleMode, data, callback);
+    native_.call('MediaControllerServerInfo_sendShuffleMode', data, callback);
 };
 
 MediaControllerServerInfo.prototype.sendRepeatMode = function(
@@ -843,26 +826,12 @@ MediaControllerServerInfo.prototype.sendRepeatMode = function(
     };
 
     var data = {
-        mode: args.mode
+        mode: args.mode,
+        name: this.name
     };
-    sendDefinedCommand(this.name, internal_commands_.sendRepeatMode, data, callback);
+    native_.call('MediaControllerServerInfo_sendRepeatMode', data, callback);
 };
 
-function sendDefinedCommand(name_, command_, data_, callback_) {
-    var nativeData = {
-        command: command_,
-        data: data_,
-        name: name_
-    };
-
-    var replyId = ReplyCommandListener.addListener(callback_);
-
-    nativeData.replyId = replyId;
-    nativeData.listenerId = ReplyCommandListener.listenerName;
-
-    native_.call('MediaControllerServerInfo_sendCommand', nativeData, callback_);
-}
-
 MediaControllerServerInfo.prototype.sendCommand = function(
     command,
     data,