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

always supply SeriesTimerId

Browse source
This commit is contained in:
Luke Pulverenti 2016-09-19 11:41:35 -04:00
parent ef9ab82058
commit 85a11e81cf
16 changed files with 499 additions and 87 deletions
Download patch file Download diff file Expand all files Collapse all files

15
dashboard-ui/scripts/htmlmediarenderer.js
View file

@ -184,8 +184,14 @@
return false;
}
if (MediaPlayer.canPlayNativeHls() && mediaSource.RunTimeTicks) {
return false;
if (MediaPlayer.canPlayNativeHls()) {
// simple playback should use the native support
if (mediaSource.RunTimeTicks) {
return false;
}
//return false;
}
// For now don't do this in edge because we lose some native audio support
@ -193,6 +199,11 @@
return false;
}
// hls.js is only in beta. needs more testing.
if (browser.safari) {
return false;
}
return true;
}

5
dashboard-ui/scripts/mediaplayer-video.js
View file

@ -986,8 +986,9 @@
if (browser.msie) {
if (!window.MediaSource || !mediaSource.RunTimeTicks) {
if (window.MediaSource == null || mediaSource.RunTimeTicks == null) {
alert('Playback of this content is not supported in Internet Explorer. For a better experience, please try a modern browser such as Google Chrome, Firefox, Opera, or Microsoft Edge.');
return;
}
}
@ -1021,7 +1022,7 @@
Dashboard.hideLoadingMsg();
streamInfo.url = hlsPlaylistUrl;
onReadyToPlay();
setTimeout(onReadyToPlay, 0);
}, function () {
Dashboard.hideLoadingMsg();

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

@ -143,9 +143,7 @@ define(['appSettings', 'userSettings', 'appStorage', 'datetime'], function (appS
return true;
}
// viblast can help us here
//return true;
return window.MediaSource;
return window.MediaSource != null;
};
self.changeStream = function (ticks, params) {

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

@ -1234,6 +1234,8 @@ var AppInfo = {};
define("playlistEditor", [embyWebComponentsBowerPath + "/playlisteditor/playlisteditor"], returnFirstDependency);
define("recordingCreator", [embyWebComponentsBowerPath + "/recordingcreator/recordingcreator"], returnFirstDependency);
define("recordingEditor", [embyWebComponentsBowerPath + "/recordingcreator/recordingeditor"], returnFirstDependency);
define("recordingFields", [embyWebComponentsBowerPath + "/recordingcreator/recordingfields"], returnFirstDependency);
define("recordingHelper", [embyWebComponentsBowerPath + "/recordingcreator/recordinghelper"], returnFirstDependency);
define("subtitleEditor", [embyWebComponentsBowerPath + "/subtitleeditor/subtitleeditor"], returnFirstDependency);
define("itemIdentifier", [embyWebComponentsBowerPath + "/itemidentifier/itemidentifier"], returnFirstDependency);
define("mediaInfo", [embyWebComponentsBowerPath + "/mediainfo/mediainfo"], returnFirstDependency);