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

dlna fixes

Browse source
This commit is contained in:
Luke Pulverenti 2014-06-22 01:52:31 -04:00
parent 11cb5f0b45
commit b9aac88766
28 changed files with 410 additions and 423 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -475,8 +475,7 @@
self.currentItem = item;
self.currentMediaSource = getOptimalMediaSource(item.MediaType, item.MediaSources);
videoPlayer(self, item, self.currentMediaSource, startPosition, user);
mediaElement = self.initVideoPlayer();
mediaElement = self.playVideo(item, self.currentMediaSource, startPosition);
self.currentDurationTicks = self.currentMediaSource.RunTimeTicks;
} else if (item.MediaType === "Audio") {
@ -940,7 +939,7 @@
var isVideo = self.currentItem.MediaType == "Video";
$(elem).off("ended.playnext").on("ended", function () {
$(elem).off("ended.playnext").one("ended", function () {
$(this).off();
@ -1106,7 +1105,7 @@
var playerElement = this;
$(playerElement).off('ended.playbackstopped');
$(playerElement).off('.mediaplayerevent').off('ended.playbackstopped');
clearProgressInterval();
@ -1259,25 +1258,25 @@
this.volume = initialVolume;
this.play();
}).on("volumechange", function () {
}).on("volumechange.mediaplayerevent", function () {
self.onVolumeChanged(this);
}).one("playing", function () {
}).one("playing.mediaplayerevent", function () {
$('.mediaPlayerAudioContainer').hide();
self.onPlaybackStart(this, item, mediaSource);
}).on("pause", function () {
}).on("pause.mediaplayerevent", function () {
self.onPlaystateChange(this);
}).on("playing", function () {
}).on("playing.mediaplayerevent", function () {
self.onPlaystateChange(this);
}).on("timeupdate", function () {
}).on("timeupdate.mediaplayerevent", function () {
self.setCurrentTime(self.getCurrentTicks(this));