mirrors/jellyfin-web
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web synced 2025-03-30 19:56:21 +00:00
Code Activity

Undo some changes

Browse source
This commit is contained in:
Tim Hobbs 2014-04-07 12:12:16 -07:00
parent a84e40f79e
commit b7e743b6a4
3 changed files with 15 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

22
ApiClient.js
View file

@ -3846,7 +3846,7 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
* @param {String} userId
* @param {String} itemId
*/
self.reportPlaybackProgress = function (userId, itemId, mediaSourceId, params) {
self.reportPlaybackProgress = function (userId, itemId, mediaSourceId, positionTicks, isPaused, isMuted) {
if (!userId) {
throw new Error("null userId");
@ -3867,9 +3867,9 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
msgData += "|" + (params.isMuted == null ? "" : params.isMuted);
msgData += "|" + (mediaSourceId == null ? "" : mediaSourceId);
msgData += "|" + (params.audioStreamIndex == null ? "" : params.audioStreamIndex);
msgData += "|" + (params.subtitleStreamIndex == null ? "" : params.subtitleStreamIndex);
msgData += "|" + (params.volumeLevel == null ? "" : params.volumeLevel);
////msgData += "|" + (params.audioStreamIndex == null ? "" : params.audioStreamIndex);
////msgData += "|" + (params.subtitleStreamIndex == null ? "" : params.subtitleStreamIndex);
////msgData += "|" + (params.volumeLevel == null ? "" : params.volumeLevel);
self.sendWebSocketMessage("PlaybackProgress", msgData);
@ -3877,14 +3877,14 @@ MediaBrowser.ApiClient = function ($, navigator, JSON, WebSocket, setTimeout, wi
return deferred.promise();
}
////var params = {
//// isPaused: isPaused,
//// isMuted: isMuted
////};
var params = {
isPaused: isPaused,
isMuted: isMuted
};
////if (positionTicks) {
//// params.positionTicks = positionTicks;
////}
if (positionTicks) {
params.positionTicks = positionTicks;
}
if (mediaSourceId) {
params.mediaSourceId = mediaSourceId;

5
dashboard-ui/scripts/chromecast.js
View file

@ -643,8 +643,9 @@
this.castPlayerState = PLAYER_STATE.LOADING;
this.session.loadMedia(request,
this.onMediaDiscovered.bind(this, 'loadMedia'),
this.onLoadMediaError.bind(this));
this.onMediaDiscovered.bind(this, 'loadMedia'),
this.onLoadMediaError.bind(this)
);
};
/**

2
dashboard-ui/scripts/mediaplayer.js
View file

@ -961,7 +961,7 @@
function sendProgressUpdate(itemId, mediaSourceId) {
ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, mediaSourceId, { positionTicks: self.getCurrentTicks(), isPaused: currentMediaElement.paused, isMuted: currentMediaElement.volume == 0 });
ApiClient.reportPlaybackProgress(Dashboard.getCurrentUserId(), itemId, mediaSourceId, self.getCurrentTicks(), currentMediaElement.paused, currentMediaElement.volume == 0);
}
function clearProgressInterval() {