MediaControllerServerInfo.prototype.addPlaylistUpdatedListener = function() {
utils_.printDeprecationWarningFor(
'MediaControllerServerInfo.addPlaylistUpdatedListener()',
- 'MediaControllerPlaylistsInfo.addPlaylistUpdateListener()'
+ 'MediaControllerPlaylistsInfo.addPlaylistUpdatedListener()'
);
var args = [this.name].concat(Array.prototype.slice.call(arguments));
- return addPlaylistUpdateListener.apply(this, args);
+ return addPlaylistUpdatedListener.apply(this, args);
};
-var addPlaylistUpdateListener = function() {
+var addPlaylistUpdatedListener = function() {
var args = validator_.validateArgs(arguments, [
{
name: 'serverName',
if (type_.isEmptyObject(ServerInfoPlaylistUpdateListener.listeners)) {
var result = native_.callSync(
- 'MediaControllerServerInfoAddPlaylistUpdateListener',
+ 'MediaControllerServerInfoAddPlaylistUpdatedListener',
{
listenerId: ServerInfoPlaylistUpdateListener.listenerName
}
MediaControllerServerInfo.prototype.removePlaylistUpdatedListener = function(watchId) {
utils_.printDeprecationWarningFor(
'MediaControllerServerInfo.removePlaylistUpdatedListener()',
- 'MediaControllerPlaylistsInfo.removePlaylistUpdateListener()'
+ 'MediaControllerPlaylistsInfo.removePlaylistUpdatedListener()'
);
- removePlaylistUpdateListener(watchId);
+ removePlaylistUpdatedListener(watchId);
};
-var removePlaylistUpdateListener = function() {
+var removePlaylistUpdatedListener = function() {
var args = validator_.validateArgs(arguments, [
{ name: 'watchId', type: types_.LONG }
]);
if (type_.isEmptyObject(ServerInfoPlaylistUpdateListener.listeners)) {
var result = native_.callSync(
- 'MediaControllerServerInfoRemovePlaylistUpdateListener'
+ 'MediaControllerServerInfoRemovePlaylistUpdatedListener'
);
if (native_.isFailure(result)) {
throw native_.getErrorObject(result);
}
});
- this.sendPlaybackAction = function(action, replyCallback) {
+ this.sendPlaybackAction = function() {
+ var args = validator_.validateArgs(arguments, [
+ {
+ name: 'action',
+ type: types_.ENUM,
+ values: Object.keys(MediaControllerPlaybackAction)
+ },
+ {
+ name: 'replyCallback',
+ type: types_.FUNCTION,
+ optional: true,
+ nullable: true
+ }
+ ]);
+
sendRequestWithReply(
_serverName,
- 'action',
- types_.ENUM,
- Object.keys(MediaControllerPlaybackAction),
'MediaControllerServerInfoPlaybackInfoSendPlaybackAction',
- action,
- replyCallback
+ args.action,
+ args.replyCallback
);
};
- this.sendPlaybackPosition = function(position, replyCallback) {
+ this.sendPlaybackPosition = function() {
+ var args = validator_.validateArgs(arguments, [
+ {
+ name: 'position',
+ type: types_.LONG_LONG
+ },
+ {
+ name: 'replyCallback',
+ type: types_.FUNCTION,
+ optional: true,
+ nullable: true
+ }
+ ]);
+
sendRequestWithReply(
_serverName,
- 'position',
- types_.LONG_LONG,
- null,
'MediaControllerServerInfoPlaybackInfoSendPlaybackPosition',
- position,
- replyCallback
+ args.position,
+ args.replyCallback
);
};
- this.sendShuffleMode = function(mode, replyCallback) {
+ this.sendShuffleMode = function() {
+ var args = validator_.validateArgs(arguments, [
+ {
+ name: 'mode',
+ type: types_.BOOLEAN
+ },
+ {
+ name: 'replyCallback',
+ type: types_.FUNCTION,
+ optional: true,
+ nullable: true
+ }
+ ]);
+
sendRequestWithReply(
_serverName,
- 'mode',
- types_.BOOLEAN,
- null,
'MediaControllerServerInfoPlaybackInfoSendShuffleMode',
- mode,
- replyCallback
+ args.mode,
+ args.replyCallback
);
};
- this.sendRepeatState = function(state, replyCallback) {
+ this.sendRepeatState = function() {
+ var args = validator_.validateArgs(arguments, [
+ {
+ name: 'state',
+ type: types_.ENUM,
+ values: Object.keys(MediaControllerRepeatState)
+ },
+ {
+ name: 'replyCallback',
+ type: types_.FUNCTION,
+ optional: true,
+ nullable: true
+ }
+ ]);
+
sendRequestWithReply(
_serverName,
- 'state',
- types_.ENUM,
- Object.keys(MediaControllerRepeatState),
'MediaControllerServerInfoPlaybackInfoSendRepeatState',
- state,
- replyCallback
+ args.state,
+ args.replyCallback
);
};
};
}
-var sendRequestWithReply = function(
- serverName,
- attribName,
- attribType,
- attribValues,
- callString,
- attribVal,
- replyCB
-) {
- var toValidate = [attribVal];
- if (undefined !== replyCB) {
- toValidate.push(replyCB);
- }
-
- var args = validator_.validateArgs(toValidate, [
- {
- name: attribName,
- type: attribType,
- values: attribValues
- },
- {
- name: 'replyCallback',
- type: types_.FUNCTION,
- optional: true,
- nullable: true
- }
- ]);
-
+var sendRequestWithReply = function(serverName, callString, attribVal, replyCB) {
var callback = function(result) {
native_.callIfPossible(
- args.replyCallback,
+ replyCB,
native_.getResultObject(result).data,
native_.getResultObject(result).code
);
};
var nativeData = {
- attribute: args[attribName],
+ attribute: attribVal,
serverName: serverName,
listenerId: ReplyCommandListener.listenerName
};
ReplyCommandListener.requestIdToListenerId[replyListenerId] = result.requestId;
};
- this.addPlaylistUpdateListener = function() {
+ this.addPlaylistUpdatedListener = function() {
var args = [_serverName].concat(Array.prototype.slice.call(arguments));
- return addPlaylistUpdateListener.apply(this, args);
+ return addPlaylistUpdatedListener.apply(this, args);
};
- this.removePlaylistUpdateListener = function(watchId) {
- removePlaylistUpdateListener(watchId);
+ this.removePlaylistUpdatedListener = function(watchId) {
+ removePlaylistUpdatedListener(watchId);
};
this.getPlaylist = function() {
REGISTER_METHOD(MediaControllerServerInfoAddPlaybackInfoChangeListener);
REGISTER_METHOD(MediaControllerServerInfoRemovePlaybackInfoChangeListener);
REGISTER_METHOD(MediaControllerServerInfoSendPlaybackItem);
- REGISTER_METHOD(MediaControllerServerInfoAddPlaylistUpdateListener);
- REGISTER_METHOD(MediaControllerServerInfoRemovePlaylistUpdateListener);
+ REGISTER_METHOD(MediaControllerServerInfoAddPlaylistUpdatedListener);
+ REGISTER_METHOD(MediaControllerServerInfoRemovePlaylistUpdatedListener);
REGISTER_METHOD(MediaControllerServerInfoGetAllPlaylists);
REGISTER_METHOD(MediaControllerServerInfoGetIconURI);
REGISTER_METHOD(MediaControllerClientAddAbilityChangeListener);
ReportSuccess(out);
}
-void MediaControllerInstance::MediaControllerServerInfoAddPlaylistUpdateListener(
+void MediaControllerInstance::MediaControllerServerInfoAddPlaylistUpdatedListener(
const picojson::value& args, picojson::object& out) {
ScopeLogger();
if (!client_) {
ReportSuccess(out);
}
-void MediaControllerInstance::MediaControllerServerInfoRemovePlaylistUpdateListener(
+void MediaControllerInstance::MediaControllerServerInfoRemovePlaylistUpdatedListener(
const picojson::value& args, picojson::object& out) {
if (!client_) {
LogAndReportError(PlatformResult(ErrorCode::UNKNOWN_ERR, MediaControllerUnknownErrorMsg), &out,