forked from mirrors/akkoma-fe
rot silencing fixes
This commit is contained in:
parent
e2de66d850
commit
f89ac17ff1
1 changed files with 5 additions and 2 deletions
|
@ -25,17 +25,20 @@
|
||||||
function setMusic(url) {
|
function setMusic(url) {
|
||||||
audio.pause();
|
audio.pause();
|
||||||
|
|
||||||
|
silent = !url;
|
||||||
if (url) {
|
if (url) {
|
||||||
console.log("Setting music: " + url);
|
console.log("Setting music: " + url);
|
||||||
audio.src = url;
|
audio.src = url;
|
||||||
playMusic();
|
playMusic();
|
||||||
|
} else {
|
||||||
|
console.log("Silencing");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
function playMusic() {
|
function playMusic() {
|
||||||
//Starts playing the music if it isn't muted and isn't already playing
|
//Starts playing the music if it isn't muted and isn't already playing
|
||||||
try {
|
try {
|
||||||
if (audio.src && audio.src != "" && audio.paused && !audio.muted) {
|
if (!silent && audio.src && audio.src != "" && audio.paused && !audio.muted) {
|
||||||
audio.currentTime = 0;
|
audio.currentTime = 0;
|
||||||
audio.play().catch(() => getPromiseFromEvent(window, 'click').then(audio.play));
|
audio.play().catch(() => getPromiseFromEvent(window, 'click').then(audio.play));
|
||||||
}
|
}
|
||||||
|
@ -85,7 +88,6 @@
|
||||||
return;
|
return;
|
||||||
|
|
||||||
//Clean up
|
//Clean up
|
||||||
console.log("Cleaning up");
|
|
||||||
for (const o of observers)
|
for (const o of observers)
|
||||||
o.disconnect();
|
o.disconnect();
|
||||||
observers.length = 0;
|
observers.length = 0;
|
||||||
|
@ -237,6 +239,7 @@
|
||||||
|
|
||||||
//Rot music player
|
//Rot music player
|
||||||
const audio = document.createElement("audio");
|
const audio = document.createElement("audio");
|
||||||
|
let silent = false;
|
||||||
audio.loop = true;
|
audio.loop = true;
|
||||||
audio.id = "user-music";
|
audio.id = "user-music";
|
||||||
audio.style = "display:none;";
|
audio.style = "display:none;";
|
||||||
|
|
Loading…
Reference in a new issue