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 stream selection

Browse source
This commit is contained in:
Luke Pulverenti 2016-04-14 15:12:00 -04:00
parent 49f8917315
commit 2300b96924
7 changed files with 17 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -1,4 +1,4 @@
define(['imageLoader', 'jQuery', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader, $) {
define(['imageLoader', 'layoutManager', 'jQuery', 'paper-icon-button', 'paper-button', 'emby-icons'], function (imageLoader, layoutManager, $) {
var mainDrawerPanel = document.querySelector('.mainDrawerPanel');
@ -933,7 +933,7 @@
viewMenuBar.classList.remove('hide');
}
if (page.classList.contains('type-interior')) {
if (page.classList.contains('type-interior') && !layoutManager.mobile) {
viewMenuBar.classList.add('headroomDisabled');
} else {
viewMenuBar.classList.remove('headroomDisabled');

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

@ -980,7 +980,7 @@
// Huge hack alert. Safari doesn't seem to like if the segments aren't available right away when playback starts
// This will start the transcoding process before actually feeding the video url into the player
// Edit: Also seeing stalls from hls.js
if ((browserInfo.safari || browserInfo.msie || browserInfo.firefox) && !mediaSource.RunTimeTicks && isHls) {
if (!mediaSource.RunTimeTicks && isHls) {
Dashboard.showLoadingMsg();
var hlsPlaylistUrl = streamInfo.url.replace('master.m3u8', 'live.m3u8');
@ -992,7 +992,12 @@
}).then(function () {
Dashboard.hideLoadingMsg();
streamInfo.url = hlsPlaylistUrl;
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
// add a delay to continue building up the buffer. without this we see failures in safari mobile
setTimeout(function () {
self.playVideoInternal(item, mediaSource, startPosition, streamInfo, callback);
}, 2000);
}, function () {
Dashboard.hideLoadingMsg();
});

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

@ -2923,8 +2923,6 @@ var AppInfo = {};
deps.push('css!devices/ios/ios.css');
} else if (AppInfo.isNativeApp && browserInfo.edge) {
deps.push('css!devices/windowsphone/wp.css');
} else if (!browserInfo.android) {
deps.push('css!devices/android/android.css');
}
loadTheme();