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

update to service stack 3.0.70.0

Browse source
This commit is contained in:
Luke Pulverenti 2013-11-30 13:32:39 -05:00
parent dbf7337f7c
commit 7e5011f03d
7 changed files with 45 additions and 29 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -503,20 +503,6 @@
var h264Codec = 'h264';
var h264AudioCodec = 'aac';
if (videoStream && videoStream.Width && videoStream.Width <= baseParams.maxWidth) {
var videoCodec = (videoStream.Codec || '').toLowerCase();
if (videoCodec.indexOf('h264') != -1 &&
videoStream.Width &&
videoStream.Width <= 1280 &&
videoStream.BitRate &&
videoStream.BitRate <= 2000000) {
//h264Codec = 'copy';
}
}
if (startPosition) {
baseParams.StartTimeTicks = startPosition;
}
@ -541,12 +527,6 @@
timeStampOffsetMs: 0
}));
var ogvVideoUrl = ApiClient.getUrl('Videos/' + item.Id + '/stream.ogv', $.extend({}, baseParams, {
videoCodec: 'theora',
audioCodec: 'Vorbis'
}));
var html = '';
var requiresControls = $.browser.msie || $.browser.android || ($.browser.webkit && !$.browser.chrome);
@ -570,7 +550,6 @@
html += '<source type="video/webm" src="' + webmVideoUrl + '" />';
}
html += '<source type="video/ogg" src="' + ogvVideoUrl + '" />';
html += '</video';
var nowPlayingBar = $('#nowPlayingBar').show();
@ -660,6 +639,12 @@
setCurrentTime(getCurrentTicks(this), item, true);
}
}).on("error", function () {
var errorCode = this.error ? this.error.code : '';
console.log('Html5 Video error code: ' + errorCode);
}).on("ended.playbackstopped", onPlaybackStopped).on('ended.playnext', playNextAfterEnded);
currentItem = item;
@ -1202,6 +1187,18 @@
}
};
self.queueItemsNext = function (items) {
var insertIndex = 1;
for (var i = 0, length = items.length; i < length; i++) {
self.playlist.splice(insertIndex, 0, items[i]);
insertIndex++;
}
};
self.queueItems = function (items) {
for (var i = 0, length = items.length; i < length; i++) {