diff --git a/dashboard-ui/dlnaprofile.html b/dashboard-ui/dlnaprofile.html
index 803f7f3aad..a5953a3c43 100644
--- a/dashboard-ui/dlnaprofile.html
+++ b/dashboard-ui/dlnaprofile.html
@@ -54,13 +54,13 @@
diff --git a/dashboard-ui/metadataadvanced.html b/dashboard-ui/metadataadvanced.html
index c1e86681ef..e395096f52 100644
--- a/dashboard-ui/metadataadvanced.html
+++ b/dashboard-ui/metadataadvanced.html
@@ -63,10 +63,10 @@
@@ -84,13 +84,13 @@
@@ -107,25 +107,25 @@
diff --git a/dashboard-ui/mypreferencesdisplay.html b/dashboard-ui/mypreferencesdisplay.html
index c101e4b87a..4b81f4d219 100644
--- a/dashboard-ui/mypreferencesdisplay.html
+++ b/dashboard-ui/mypreferencesdisplay.html
@@ -28,9 +28,9 @@
-
+
-
+
diff --git a/dashboard-ui/scripts/channelsettings.js b/dashboard-ui/scripts/channelsettings.js
index 75084e53c3..92ffad87c6 100644
--- a/dashboard-ui/scripts/channelsettings.js
+++ b/dashboard-ui/scripts/channelsettings.js
@@ -20,7 +20,7 @@
var isChecked = config.DownloadingChannels.indexOf(channel.Id) != -1 ? ' checked="checked"' : '';
- html += '';
+ html += '';
html += '';
}
diff --git a/dashboard-ui/scripts/chromecast.js b/dashboard-ui/scripts/chromecast.js
index 0c35b29a25..8dc495d7aa 100644
--- a/dashboard-ui/scripts/chromecast.js
+++ b/dashboard-ui/scripts/chromecast.js
@@ -205,6 +205,7 @@
this.deviceState = DEVICE_STATE.ACTIVE;
this.session.addMessageListener(messageNamespace, this.messageListener.bind(this));
+ this.session.addMediaListener(this.sessionMediaListener.bind(this));
this.session.addUpdateListener(this.sessionUpdateListener.bind(this));
$(this).trigger('connect');
@@ -212,6 +213,16 @@
MediaController.setActivePlayer(PlayerName);
};
+ /**
+ * session update listener
+ */
+ CastPlayer.prototype.sessionMediaListener = function (e) {
+
+ console.log('sessionMediaListener');
+ this.currentMediaSession = e;
+ this.currentMediaSession.addUpdateListener(this.mediaStatusUpdateHandler);
+ };
+
/**
* Callback function for launch error
*/
@@ -259,39 +270,45 @@
return;
}
+ this.sendMessage({
+ options: options,
+ command: command
+ });
+ };
+
+ CastPlayer.prototype.sendMessage = function (message) {
+
var player = this;
- var message = {
- options: options,
- command: command,
-
+ message = $.extend(message, {
userId: Dashboard.getCurrentUserId(),
deviceId: ApiClient.deviceId(),
accessToken: ApiClient.accessToken(),
serverAddress: ApiClient.serverAddress()
- };
+ });
// If the user is on localhost we need a different address to send to the receiver
var address = message.serverAddress.toLowerCase();
if (address.indexOf('localhost') != -1 || address.indexOf('127.0.0') != -1) {
- ApiClient.getSystemInfo().done(function(info) {
+ ApiClient.getSystemInfo().done(function (info) {
message.serverAddress = info.WanAddress;
- player.sendMessage(message);
+ player.sendMessageInternal(message);
});
} else {
- player.sendMessage(message);
+ player.sendMessageInternal(message);
}
};
- CastPlayer.prototype.sendMessage = function(message) {
+ CastPlayer.prototype.sendMessageInternal = function (message) {
+
message = JSON.stringify(message);
//console.log(message);
this.session.sendMessage(messageNamespace, message, this.onPlayCommandSuccess.bind(this), this.errorHandler);
- }
+ };
CastPlayer.prototype.onPlayCommandSuccess = function () {
console.log('Message was sent to receiver ok.');
@@ -514,6 +531,9 @@
$(castPlayer).on("playbackstart", function (e, data) {
console.log('cc: playbackstart');
+
+ castPlayer.initializeCastPlayer();
+
var state = self.getPlayerStateInternal(data);
$(self).trigger("playbackstart", [state]);
});
@@ -636,6 +656,10 @@
self.displayContent = function (options) {
+ castPlayer.sendMessage({
+ options: options,
+ command: 'DisplayContent'
+ });
};
self.mute = function () {
@@ -683,7 +707,8 @@
"Mute",
"Unmute",
"ToggleMute",
- "SetVolume"]
+ "SetVolume",
+ "DisplayContent"]
};
};
@@ -747,6 +772,7 @@
data = data || self.lastPlayerData;
self.lastPlayerData = data;
+
console.log(JSON.stringify(data));
return data;
};
diff --git a/dashboard-ui/scripts/userparentalcontrol.js b/dashboard-ui/scripts/userparentalcontrol.js
index 39ab2b014d..e4f95bb06b 100644
--- a/dashboard-ui/scripts/userparentalcontrol.js
+++ b/dashboard-ui/scripts/userparentalcontrol.js
@@ -54,7 +54,7 @@
var checkedAttribute = user.Configuration.BlockedMediaFolders.indexOf(folder.Id) == -1 && user.Configuration.BlockedMediaFolders.indexOf(folder.Name) == -1 ? ' checked="checked"' : '';
- html += '';
+ html += '';
html += '';
}
@@ -79,7 +79,7 @@
var checkedAttribute = user.Configuration.BlockedChannels.indexOf(folder.Id) == -1 ? ' checked="checked"' : '';
- html += '';
+ html += '';
html += '';
}
@@ -123,7 +123,7 @@
var checkedAttribute = user.Configuration.BlockUnratedItems.indexOf(item.value) != -1 ? ' checked="checked"' : '';
- html += '';
+ html += '';
html += '';
}