mirrors/copyparty
1
0
Fork 0
mirror of https://github.com/9001/copyparty.git synced 2025-08-17 17:12:13 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

audio-player: show status while loading

Browse source
This commit is contained in:
ed 2024-07-29 20:14:39 +00:00
parent 225bd80ea8
commit 662541c64c
1 changed files with 24 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

25
copyparty/web/browser.js
View file

@ -270,6 +270,8 @@ var Ls = {
"mb_play": "play", "mb_play": "play",
"mm_hashplay": "play this audio file?", "mm_hashplay": "play this audio file?",
"mp_breq": "need firefox 82+ or chrome 73+ or iOS 15+", "mp_breq": "need firefox 82+ or chrome 73+ or iOS 15+",
"mm_bload": "now loading...",
"mm_bconv": "converting to {0}, please wait...",
"mm_opusen": "your browser cannot play aac / m4a files;\ntranscoding to opus is now enabled", "mm_opusen": "your browser cannot play aac / m4a files;\ntranscoding to opus is now enabled",
"mm_playerr": "playback failed: ", "mm_playerr": "playback failed: ",
"mm_eabrt": "The playback attempt was cancelled", "mm_eabrt": "The playback attempt was cancelled",
@ -785,6 +787,8 @@ var Ls = {
"mb_play": "lytt", "mb_play": "lytt",
"mm_hashplay": "spill denne sangen?", "mm_hashplay": "spill denne sangen?",
"mp_breq": "krever firefox 82+, chrome 73+, eller iOS 15+", "mp_breq": "krever firefox 82+, chrome 73+, eller iOS 15+",
"mm_bload": "laster inn...",
"mm_bconv": "konverterer til {0}, vent litt...",
"mm_opusen": "nettleseren din forstår ikke aac / m4a;\nkonvertering til opus er nå aktivert", "mm_opusen": "nettleseren din forstår ikke aac / m4a;\nkonvertering til opus er nå aktivert",
"mm_playerr": "avspilling feilet: ", "mm_playerr": "avspilling feilet: ",
"mm_eabrt": "Avspillingsforespørselen ble avbrutt", "mm_eabrt": "Avspillingsforespørselen ble avbrutt",
@ -1602,6 +1606,8 @@ var mpl = (function () {
r.pp = function () { r.pp = function () {
var adur, apos, playing = mp.au && !mp.au.paused; var adur, apos, playing = mp.au && !mp.au.paused;
clearTimeout(mpl.t_eplay);
clmod(ebi('np_inf'), 'playing', playing); clmod(ebi('np_inf'), 'playing', playing);
if (mp.au && isNum(adur = mp.au.duration) && isNum(apos = mp.au.currentTime) && apos >= 0) if (mp.au && isNum(adur = mp.au.duration) && isNum(apos = mp.au.currentTime) && apos >= 0)
@ -2187,8 +2193,21 @@ var pbar = (function () {
} }
pctx.clearRect(0, 0, pc.w, pc.h); pctx.clearRect(0, 0, pc.w, pc.h);
if (!mp || !mp.au || !isNum(adur = mp.au.duration) || !isNum(apos = mp.au.currentTime) || apos < 0 || adur < apos) if (!mp || !mp.au)
return; // not-init
if (!isNum(adur = mp.au.duration) || !isNum(apos = mp.au.currentTime) || apos < 0 || adur < apos) {
if (Date.now() - mp.au.pt0 < 500)
return;
pctx.fillStyle = light ? 'rgba(0,0,0,0.5)' : 'rgba(255,255,255,0.5)';
var m = /[?&]th=(opus|caf|mp3)/.exec('' + mp.au.rsrc),
txt = mp.au.ded ? L.mm_playerr.replace(':', ' ;_;') :
m ? L.mm_bconv.format(m[1]) : L.mm_bload;
pctx.fillText(txt, 16, pc.h / 1.5);
return; // not-init || unsupp-codec return; // not-init || unsupp-codec
}
if (bau != mp.au) if (bau != mp.au)
r.drawbuf(); r.drawbuf();
@ -3154,7 +3173,9 @@ function play(tid, is_ev, seek) {
mpl.unbuffer(url); mpl.unbuffer(url);
}, 500); }, 500);
mp.au.ded = 0;
mp.au.tid = tid; mp.au.tid = tid;
mp.au.pt0 = Date.now();
mp.au.evp = get_evpath(); mp.au.evp = get_evpath();
mp.au.volume = mp.expvol(mp.vol); mp.au.volume = mp.expvol(mp.vol);
var trs = QSA('#files tr.play'); var trs = QSA('#files tr.play');
@ -3222,6 +3243,8 @@ function evau_error(e) {
var err = '', var err = '',
eplaya = (e && e.target) || (window.event && window.event.srcElement); eplaya = (e && e.target) || (window.event && window.event.srcElement);
eplaya.ded = 1;
switch (eplaya.error.code) { switch (eplaya.error.code) {
case eplaya.error.MEDIA_ERR_ABORTED: case eplaya.error.MEDIA_ERR_ABORTED:
err = L.mm_eabrt; err = L.mm_eabrt;