diff options
Diffstat (limited to 'libs/music/player.d/main_static.js')
-rw-r--r-- | libs/music/player.d/main_static.js | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/libs/music/player.d/main_static.js b/libs/music/player.d/main_static.js index 7070e1d..cf2e610 100644 --- a/libs/music/player.d/main_static.js +++ b/libs/music/player.d/main_static.js @@ -47,7 +47,7 @@ NSPlayer={ current:null, shuffle:0, repeat:0, - served_formats:{'ogg':{'mime':'audio/ogg; codecs=vorbis','disp':'ogg 224 kbps'},'flac':{'mime':'audio/flac','disp':'flac'},'opus':{'mime':'audio/ogg; codecs=opus','disp':'opus 96 kbps'},'m4a':{'mime':'audio/aac','disp':'aac 192kbps'}}, + served_formats:{'vorbis':{'mime':'audio/ogg; codecs=vorbis','disp':'ogg 224 kbps','ext':'ogg'},'flac':{'mime':'audio/flac','disp':'flac'},'opus':{'mime':'audio/ogg; codecs=opus','disp':'opus 96 kbps'},'m4a':{'mime':'audio/aac','disp':'aac 192kbps'}}, get_preferred_or_default_format:function() { if (sh.getcookie('preferredformat') in this.served_formats) @@ -91,7 +91,8 @@ NSPlayer={ navigator.mediaSession.metadata=new MediaMetadata({title:this.tracks[id].title,album:this.plistname}); NSUI.set_highlighted(this.plistname,this.tracks[id].title); const fmt=NSPlayer.get_preferred_or_default_format(); - NSUI.audio.src=`//filestorage.chrisoft.org/music/${fmt}/${this.tracks[id].title}.${fmt}`; + const ext=(NSPlayer.served_formats[fmt].ext !== undefined) ? NSPlayer.served_formats[fmt].ext : fmt; + NSUI.audio.src=`//filestorage.chrisoft.org/music/${fmt}/${this.tracks[id].title}.${ext}`; NSUI.audio.load(); return NSUI.audio.play(); }, @@ -343,7 +344,8 @@ NSUI={ const a=sh.newelem('a'); a.innerHTML=list[i].title; const fmt=NSPlayer.get_preferred_or_default_format(); - a.href=`//filestorage.chrisoft.org/music/${fmt}/${list[i].title}.${fmt}`; + const ext=(NSPlayer.served_formats[fmt].ext !== undefined) ? NSPlayer.served_formats[fmt].ext : fmt; + a.href=`//filestorage.chrisoft.org/music/${fmt}/${list[i].title}.${ext}`; a.ord=i; a.onclick=function(e){e.preventDefault();NSUI.switch_track.bind(NSUI,this.ord)();}; l.appendChild(a); @@ -830,3 +832,4 @@ function init() NSUI.vissel.value=sh.getcookie('playervisualization'); requestAnimationFrame(NSVisualization.updateVisualization); } +document.addEventListener("DOMContentLoaded", init); |