mgoetz/soundboard
1
0
Fork 0
forked from server/soundboard
Code Issues Pull Requests Releases Wiki Activity

added kill audio support for local playback

Browse Source
This commit is contained in:
Erhard 2017-08-04 00:58:39 +02:00
parent 55e8e04bb2
commit cd933addf7
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
static/main.js
View File

@ -66,11 +66,7 @@ ready(function() {
resetSearch(); resetSearch();
} else if ((evt.keyCode == 75 || evt.keyCode == 67) && evt.ctrlKey) { } else if ((evt.keyCode == 75 || evt.keyCode == 67) && evt.ctrlKey) {
// ctrl+k and ctrl+c key binding // ctrl+k and ctrl+c key binding
if (localModeEnabled) { killAllAudio();
killAllHowlerAudio();
} else {
ajaxRequest("/?killvideo=yes");
}
} else if (evt.keyCode == 88 && evt.ctrlKey){ } else if (evt.keyCode == 88 && evt.ctrlKey){
toggleLocalMode(); toggleLocalMode();
} }
@ -85,7 +81,7 @@ ready(function() {
// keylistener for enter or ctrl+enter (which is k10 on chrome) // keylistener for enter or ctrl+enter (which is k10 on chrome)
if (key === 13 || (key === 10 && e.ctrlKey)) { if (key === 13 || (key === 10 && e.ctrlKey)) {
if(e.ctrlKey){ if(e.ctrlKey){
ajaxRequest("/?killvideo=yes"); killAllAudio();
await sleep(100); await sleep(100);
} }
source.classList.add("sound-pressed"); source.classList.add("sound-pressed");
@ -172,3 +168,11 @@ function killAllHowlerAudio(){
} }
} }
function killAllAudio(){
if (localModeEnabled) {
killAllHowlerAudio();
} else {
ajaxRequest("/?killvideo=yes");
}
}

2
templates/index.html
View File

@ -53,7 +53,7 @@
</form> </form>
<button onclick="playStream();">Play!</button> <button onclick="playStream();">Play!</button>
</div> </div>
<button name="submit" onclick="ajaxRequest('/?killvideo=yes');">Terminate videos</button> <button name="submit" onclick="killAllAudio();">Terminate videos</button>
</section> </section>
<section id="voice" style="display:none;"> <section id="voice" style="display:none;">
<form action="/say/" method="POST"> <form action="/say/" method="POST">