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

add movie resolver fix

Browse source
This commit is contained in:
Luke Pulverenti 2015-09-09 23:22:52 -04:00
parent c23547137d
commit 50dc5c4d1b
13 changed files with 398 additions and 25 deletions
Download patch file Download diff file Expand all files Collapse all files

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

@ -2032,6 +2032,10 @@ var AppInfo = {};
define("audiorenderer", ["cordova/android/vlcplayer"]);
define("videorenderer", ["cordova/android/vlcplayer"]);
}
else if (Dashboard.isRunningInCordova() && $.browser.safari) {
define("audiorenderer", ["cordova/ios/vlcplayer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]);
}
else {
define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["scripts/htmlmediarenderer"]);
@ -2138,9 +2142,11 @@ var AppInfo = {};
define("cryptojs-sha1", ["apiclient/sha1"]);
define("contentuploader", ["apiclient/contentuploader"]);
define("serversync", ["apiclient/serversync"]);
define("multiserversync", ["apiclient/multiserversync"]);
define("contentuploader", ["apiclient/sync/contentuploader"]);
define("serversync", ["apiclient/sync/serversync"]);
define("multiserversync", ["apiclient/sync/multiserversync"]);
define("offlineusersync", ["apiclient/sync/offlineusersync"]);
define("mediasync", ["apiclient/sync/mediasync"]);
var deps = [];
@ -2192,6 +2198,15 @@ var AppInfo = {};
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(',');
}
else if (Dashboard.isRunningInCordova() && $.browser.safari) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(',');
// TODO: This is going to exclude it from both playback and sync, so improve on this
if (AppSettings.syncLosslessAudio()) {
AppInfo.directPlayAudioContainers.push('flac');
}
}
capabilities.DeviceProfile = MediaPlayer.getDeviceProfile(Math.max(screen.height, screen.width));
createConnectionManager(capabilities).done(function () { onConnectionManagerCreated(deferred); });