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

Cast updates

Browse source 
Added some changes that were made to the official google demo this is
based on, plus a fix for getting the device name
This commit is contained in:
Tim Hobbs 2014-04-26 21:46:12 -07:00
parent 591484aec6
commit a59b0ce027
1 changed files with 26 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -77,6 +77,11 @@
// Playback display element id // Playback display element id
this.playback = "playTime"; this.playback = "playTime";
// bind once - commit 2ebffc2271da0bc5e8b13821586aee2a2e3c7753
this.errorHandler = this.onError.bind(this);
this.incrementMediaTimeHandler = this.incrementMediaTime.bind(this);
this.mediaStatusUpdateHandler = this.onMediaStatusUpdate.bind(this);
this.initializeCastPlayer(); this.initializeCastPlayer();
}; };
@ -110,7 +115,8 @@
console.log('chromecast.initialize'); console.log('chromecast.initialize');
chrome.cast.initialize(apiConfig, this.onInitSuccess.bind(this), this.onError.bind(this)); chrome.cast.initialize(apiConfig, this.onInitSuccess.bind(this), this.errorHandler);
}; };
/** /**
@ -225,7 +231,7 @@
*/ */
CastPlayer.prototype.stopApp = function () { CastPlayer.prototype.stopApp = function () {
this.session.stop(this.onStopAppSuccess.bind(this, 'Session stopped'), this.session.stop(this.onStopAppSuccess.bind(this, 'Session stopped'),
this.onError.bind(this)); this.errorHandler);
}; };
@ -294,7 +300,7 @@
if (how == 'loadMedia') { if (how == 'loadMedia') {
this.castPlayerState = PLAYER_STATE.PLAYING; this.castPlayerState = PLAYER_STATE.PLAYING;
clearInterval(this.timer); clearInterval(this.timer);
this.startProgressTimer(this.incrementMediaTime); this.startProgressTimer();
} }
if (how == 'activeSession') { if (how == 'activeSession') {
@ -303,11 +309,11 @@
if (this.castPlayerState == PLAYER_STATE.PLAYING) { if (this.castPlayerState == PLAYER_STATE.PLAYING) {
// start progress timer // start progress timer
this.startProgressTimer(this.incrementMediaTime); this.startProgressTimer();
} }
this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this)); this.currentMediaSession.addUpdateListener(this.mediaStatusUpdateHandler);
this.currentMediaDuration = mediaSession.media.customData.runTimeTicks; this.currentMediaDuration = mediaSession.media.duration * 10000000;
}; };
/** /**
@ -362,18 +368,18 @@
case PLAYER_STATE.PAUSED: case PLAYER_STATE.PAUSED:
this.currentMediaSession.play(null, this.currentMediaSession.play(null,
this.mediaCommandSuccessCallback.bind(this, "playing started for " + this.currentMediaSession.sessionId), this.mediaCommandSuccessCallback.bind(this, "playing started for " + this.currentMediaSession.sessionId),
this.onError.bind(this)); this.errorHandler);
this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this)); this.currentMediaSession.addUpdateListener(this.mediaStatusUpdateHandler);
this.castPlayerState = PLAYER_STATE.PLAYING; this.castPlayerState = PLAYER_STATE.PLAYING;
// start progress timer // start progress timer
clearInterval(this.timer); clearInterval(this.timer);
this.startProgressTimer(this.incrementMediaTime); this.startProgressTimer();
break; break;
case PLAYER_STATE.IDLE: case PLAYER_STATE.IDLE:
case PLAYER_STATE.LOADING: case PLAYER_STATE.LOADING:
case PLAYER_STATE.STOPPED: case PLAYER_STATE.STOPPED:
this.loadMedia(this.currentMediaIndex); this.loadMedia(this.currentMediaIndex);
this.currentMediaSession.addUpdateListener(this.onMediaStatusUpdate.bind(this)); this.currentMediaSession.addUpdateListener(this.mediaStatusUpdateHandler);
this.castPlayerState = PLAYER_STATE.PLAYING; this.castPlayerState = PLAYER_STATE.PLAYING;
break; break;
default: default:
@ -394,7 +400,7 @@
this.castPlayerState = PLAYER_STATE.PAUSED; this.castPlayerState = PLAYER_STATE.PAUSED;
this.currentMediaSession.pause(null, this.currentMediaSession.pause(null,
this.mediaCommandSuccessCallback.bind(this, "paused " + this.currentMediaSession.sessionId), this.mediaCommandSuccessCallback.bind(this, "paused " + this.currentMediaSession.sessionId),
this.onError.bind(this)); this.errorHandler);
clearInterval(this.timer); clearInterval(this.timer);
} }
}; };
@ -410,7 +416,7 @@
this.currentMediaSession.stop(null, this.currentMediaSession.stop(null,
this.mediaCommandSuccessCallback.bind(this, "stopped " + this.currentMediaSession.sessionId), this.mediaCommandSuccessCallback.bind(this, "stopped " + this.currentMediaSession.sessionId),
this.onError.bind(this)); this.errorHandler);
this.castPlayerState = PLAYER_STATE.STOPPED; this.castPlayerState = PLAYER_STATE.STOPPED;
clearInterval(this.timer); clearInterval(this.timer);
}; };
@ -429,12 +435,12 @@
this.currentVolume = vol || 1; this.currentVolume = vol || 1;
this.session.setReceiverVolumeLevel(this.currentVolume, this.session.setReceiverVolumeLevel(this.currentVolume,
this.mediaCommandSuccessCallback.bind(this), this.mediaCommandSuccessCallback.bind(this),
this.onError.bind(this)); this.errorHandler);
} }
else { else {
this.session.setReceiverMuted(true, this.session.setReceiverMuted(true,
this.mediaCommandSuccessCallback.bind(this), this.mediaCommandSuccessCallback.bind(this),
this.onError.bind(this)); this.errorHandler);
} }
}; };
@ -487,7 +493,7 @@
request.currentTime = this.currentMediaTime; request.currentTime = this.currentMediaTime;
this.currentMediaSession.seek(request, this.currentMediaSession.seek(request,
this.onSeekSuccess.bind(this, 'media seek done'), this.onSeekSuccess.bind(this, 'media seek done'),
this.onError.bind(this)); this.errorHandler);
this.castPlayerState = PLAYER_STATE.SEEKING; this.castPlayerState = PLAYER_STATE.SEEKING;
}; };
@ -571,14 +577,14 @@
/** /**
* @param {function} A callback function for the fucntion to start timer * @param {function} A callback function for the fucntion to start timer
*/ */
CastPlayer.prototype.startProgressTimer = function(callback) { CastPlayer.prototype.startProgressTimer = function() {
if(this.timer) { if(this.timer) {
clearInterval(this.timer); clearInterval(this.timer);
this.timer = null; this.timer = null;
} }
// start progress timer // start progress timer
this.timer = setInterval(callback.bind(this), this.timerStep); this.timer = setInterval(this.incrementMediaTimeHandler, this.timerStep);
}; };
var castPlayer = new CastPlayer(); var castPlayer = new CastPlayer();
@ -1257,14 +1263,14 @@
self.getCurrentTargetInfo = function () { self.getCurrentTargetInfo = function () {
var appName = null; var appName = null;
if (castPlayer.session && castPlayer.session.receiver && castPlayer.session.friendlyName) { if (castPlayer.session && castPlayer.session.receiver && castPlayer.session.receiver.friendlyName) {
appName = castPlayer.session.friendlyName; appName = castPlayer.session.receiver.friendlyName;
} }
return { return {
name: PlayerName, name: PlayerName,
id: PlayerName, id: PlayerName,
playerName: self.name, playerName: self.name, // TODO: PlayerName == self.name, so do we need to use either/or?
playableMediaTypes: ["Audio", "Video"], playableMediaTypes: ["Audio", "Video"],
isLocalPlayer: false, isLocalPlayer: false,
appName: appName, appName: appName,