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

support audio queuing without flyout

Browse source
This commit is contained in:
Luke Pulverenti 2014-01-18 12:58:05 -05:00
parent e91d8b6800
commit ab0b54902f
6 changed files with 39 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -616,7 +616,6 @@
// Some 1080- videos are reported as 1912?
if (maxAllowedWidth >= 1910) {
options.push({ name: '1080p - 15Mbps', maxWidth: 1920, bitrate: 15000000 });
options.push({ name: '1080p - 10Mbps', maxWidth: 1920, bitrate: 10000000 });
options.push({ name: '1080p - 8Mbps', maxWidth: 1920, bitrate: 8000000 });
options.push({ name: '1080p - 6Mbps', maxWidth: 1920, bitrate: 6000000 });
@ -892,6 +891,17 @@
var errorCode = this.error ? this.error.code : '';
console.log('Html5 Video error code: ' + errorCode);
var errorMsg = 'There was an error playing the video.';
if (item.Type == "Channel") {
errorMsg += " Please ensure there is an open tuner availalble.";
}
Dashboard.alert({
title: 'Video Error',
message: errorMsg
});
}).on("ended.playbackstopped", onPlaybackStopped)
.on('ended.playnext', playNextAfterEnded);
@ -1467,6 +1477,11 @@
self.queue = function (id) {
if (!currentMediaElement) {
self.playById(id);
return;
}
ApiClient.getItem(Dashboard.getCurrentUserId(), id).done(function (item) {
if (item.IsFolder) {