cotugno/jellyfin-web
2
Fork 0
mirror of https://github.com/jellyfin/jellyfin-web.git synced 2024-11-18 03:18:19 -07:00
Code Issues Packages Projects Releases Wiki Activity

update audio player

Browse Source
This commit is contained in:
Luke 2016-01-17 23:25:30 -05:00
parent 69991536a3
commit 047fd2b438
4 changed files with 2 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
dashboard-ui/mysyncsettings.html
View File

@ -24,11 +24,6 @@
<div> <div>
<paper-checkbox id="chkWifi">${OptionSyncOnlyOnWifi}</paper-checkbox> <paper-checkbox id="chkWifi">${OptionSyncOnlyOnWifi}</paper-checkbox>
</div> </div>
<br />
<div>
<paper-checkbox id="chkSyncLosslessAudio">${OptionSyncLosslessAudioOriginal}</paper-checkbox>
</div>
</div> </div>
<br /> <br />

8
dashboard-ui/scripts/appsettings.js
View File

@ -84,14 +84,6 @@
return appStorage.getItem('syncOnlyOnWifi') != 'false'; return appStorage.getItem('syncOnlyOnWifi') != 'false';
}, },
syncLosslessAudio: function (val) {
if (val != null) {
update('syncLosslessAudio', val.toString());
}
return appStorage.getItem('syncLosslessAudio') != 'false';
},
syncPath: function (val) { syncPath: function (val) {
if (val != null) { if (val != null) {

2
dashboard-ui/scripts/mysyncsettings.js
View File

@ -4,7 +4,6 @@
page.querySelector('#txtSyncPath').value = AppSettings.syncPath(); page.querySelector('#txtSyncPath').value = AppSettings.syncPath();
page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi(); page.querySelector('#chkWifi').checked = AppSettings.syncOnlyOnWifi();
page.querySelector('#chkSyncLosslessAudio').checked = AppSettings.syncLosslessAudio();
var uploadServers = AppSettings.cameraUploadServers(); var uploadServers = AppSettings.cameraUploadServers();
@ -24,7 +23,6 @@
AppSettings.syncPath(page.querySelector('#txtSyncPath').value); AppSettings.syncPath(page.querySelector('#txtSyncPath').value);
AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked); AppSettings.syncOnlyOnWifi(page.querySelector('#chkWifi').checked);
AppSettings.syncLosslessAudio(page.querySelector('#chkSyncLosslessAudio').checked);
AppSettings.cameraUploadServers($(".chkUploadServer", page).get().filter(function (i) { AppSettings.cameraUploadServers($(".chkUploadServer", page).get().filter(function (i) {

16
dashboard-ui/scripts/site.js
View File

@ -2008,7 +2008,7 @@ var AppInfo = {};
} }
if (Dashboard.isRunningInCordova() && browserInfo.android) { if (Dashboard.isRunningInCordova() && browserInfo.android) {
define("audiorenderer", ["cordova/android/vlcplayer"]); define("audiorenderer", ["scripts/htmlmediarenderer"]);
define("videorenderer", ["cordova/android/vlcplayer"]); define("videorenderer", ["cordova/android/vlcplayer"]);
} }
else if (Dashboard.isRunningInCordova() && browserInfo.safari) { else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
@ -2133,23 +2133,11 @@ var AppInfo = {};
}; };
if (Dashboard.isRunningInCordova() && browserInfo.android) { if (Dashboard.isRunningInCordova() && browserInfo.android) {
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');
}
AppInfo.directPlayVideoContainers = "m4v,3gp,ts,mpegts,mov,xvid,vob,mkv,wmv,asf,ogm,ogv,m2v,avi,mpg,mpeg,mp4,webm".split(','); 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() && browserInfo.safari) { else if (Dashboard.isRunningInCordova() && browserInfo.safari) {
AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus".split(','); AppInfo.directPlayAudioContainers = "aac,mp3,mpa,wav,wma,mp2,ogg,oga,webma,ape,opus,flac".split(',');
// TODO: This is going to exclude it from both playback and sync, so improve on this
if (AppSettings.syncLosslessAudio()) {
AppInfo.directPlayAudioContainers.push('flac');
}
} }
var promises = []; var promises = [];