techwire/copyparty
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add alternative preloader for spotty connections

Browse Source
This commit is contained in:
ed 2021-11-08 20:46:40 +01:00
parent a2af61cf6f
commit e7e71b76f0
2 changed files with 25 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
copyparty/web/browser.css
View File

@ -870,11 +870,13 @@ html.light #tree.nowrap .ntree a+a:hover {
border-bottom: 1px solid #555; border-bottom: 1px solid #555;
} }
#thumbs, #thumbs,
#au_fullpre,
#au_osd_cv, #au_osd_cv,
#u2tdate { #u2tdate {
opacity: .3; opacity: .3;
} }
#griden.on+#thumbs, #griden.on+#thumbs,
#au_preload.on+#au_fullpre,
#au_os_ctl.on+#au_osd_cv, #au_os_ctl.on+#au_osd_cv,
#u2turbo.on+#u2tdate { #u2turbo.on+#u2tdate {
opacity: 1; opacity: 1;

28
copyparty/web/browser.js
View File

@ -314,6 +314,7 @@ var mpl = (function () {
ebi('op_player').innerHTML = ( ebi('op_player').innerHTML = (
'<div><h3>switches</h3><div>' + '<div><h3>switches</h3><div>' +
'<a href="#" class="tgl btn" id="au_preload" tt="start loading the next song near the end for gapless playback">preload</a>' + '<a href="#" class="tgl btn" id="au_preload" tt="start loading the next song near the end for gapless playback">preload</a>' +
'<a href="#" class="tgl btn" id="au_fullpre" tt="try to preload the entire song;$N✔️ enable on <b>unreliable</b> connections,$N❌ <b>disable</b> on slow connections probably">full</a>' +
'<a href="#" class="tgl btn" id="au_npclip" tt="show buttons for clipboarding the currently playing song">/np clip</a>' + '<a href="#" class="tgl btn" id="au_npclip" tt="show buttons for clipboarding the currently playing song">/np clip</a>' +
'<a href="#" class="tgl btn" id="au_os_ctl" tt="os integration (media hotkeys / osd)">os-ctl</a>' + '<a href="#" class="tgl btn" id="au_os_ctl" tt="os integration (media hotkeys / osd)">os-ctl</a>' +
'<a href="#" class="tgl btn" id="au_osd_cv" tt="show album cover in osd">osd-cv</a>' + '<a href="#" class="tgl btn" id="au_osd_cv" tt="show album cover in osd">osd-cv</a>' +
@ -343,6 +344,7 @@ var mpl = (function () {
"os_ctl": bcfg_get('au_os_ctl', have_mctl) && have_mctl, "os_ctl": bcfg_get('au_os_ctl', have_mctl) && have_mctl,
}; };
bcfg_bind(r, 'preload', 'au_preload', true); bcfg_bind(r, 'preload', 'au_preload', true);
bcfg_bind(r, 'fullpre', 'au_fullpre', false);
bcfg_bind(r, 'osd_cv', 'au_osd_cv', true); bcfg_bind(r, 'osd_cv', 'au_osd_cv', true);
bcfg_bind(r, 'clip', 'au_npclip', false, function (v) { bcfg_bind(r, 'clip', 'au_npclip', false, function (v) {
clmod(ebi('wtoggle'), 'np', v && mp.au); clmod(ebi('wtoggle'), 'np', v && mp.au);
@ -587,8 +589,25 @@ function MPlayer() {
} }
r.preload = function (url) { r.preload = function (url) {
var au = null;
url = mpl.acode(url); url = mpl.acode(url);
url += url.indexOf('?') < 0 ? '?cache' : '&cache';
if (mpl.fullpre)
return fetch(url).then(function (x) {
var rd = x.body.getReader(), n = 0;
function drop(x) {
if (x && x.value && x.value.length)
n += x.value.length;
if (n >= 128 * 1024 * 1024)
return console.log('aborting preload at 128 MiB');
if (!x || !x.done)
return rd.read().then(drop);
}
drop();
});
var au = null;
if (need_ogv_for(url)) { if (need_ogv_for(url)) {
au = mp.au_ogvjs2; au = mp.au_ogvjs2;
if (!au && window['OGVPlayer']) { if (!au && window['OGVPlayer']) {
@ -604,9 +623,8 @@ function MPlayer() {
r.au_native2 = au; r.au_native2 = au;
} }
} }
if (au) { if (au)
au.src = url + (url.indexOf('?') < 0 ? '?cache' : '&cache'); au.src = url;
}
}; };
} }
@ -1067,7 +1085,7 @@ var mpui = (function () {
var pos = mp.au.currentTime, var pos = mp.au.currentTime,
len = mp.au.duration; len = mp.au.duration;
if (pos > 0 && pos > len - 20) { if (pos > 0 && pos > len - (mpl.fullpre ? 40 : 20)) {
preloaded = mp.au.src; preloaded = mp.au.src;
try { try {
mp.preload(mp.tracks[mp.order[mp.order.indexOf(mp.au.tid) + 1]]); mp.preload(mp.tracks[mp.order[mp.order.indexOf(mp.au.tid) + 1]]);