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

Revert "Merge branch 'master' of https://git.wiai.de/mmueller/soundboard"

Browse Source 
This reverts commit 95bc31dc24088de96532cfe6d17c99ec889cf771, reversing
changes made to f570309d9cc64b761aa2354da885be9cdf8d1b42.
This commit is contained in:
Martin Müller 2017-10-26 13:05:25 +02:00
parent 743807a3ac
commit a1b9dd39c6
3 changed files with 6 additions and 109 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
soundboard.py
View File

@ -36,11 +36,7 @@ def index(sound=None, text=None, video=None):
pitch = request.form.get("pitch", default="")
pitch = pitch if pitch.strip() != "" else "50"
<<<<<<< HEAD
subprocess.Popen(["espeak", "-v", voice, "-s", speed, "-p", pitch, text.encode('utf-8')], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
=======
subprocess.Popen(["espeak", "-v", voice, "-s", speed, "-p", pitch, text.encode("utf-8")], stdout=subprocess.DEVNULL, stderr=subprocess.DEVNULL)
>>>>>>> f570309d9cc64b761aa2354da885be9cdf8d1b42
return redirect("/")
video = request.args.get("video")

28
static/main.css
View File

@ -80,14 +80,14 @@ section {
width: 100%;
}
div #reset {
#reset {
font-size: 2em;
padding-left: 5px;
display: inline;
vertical-align: middle;
}
div #reset:hover {
#reset:hover {
cursor: pointer;
}
@ -140,27 +140,3 @@ div #reset:hover {
color: red;
}
.sound a:active {
background-color: #ff4136;
box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6);
cursor: pointer;
}
.sound-pressed {
background-color: #ff4136 !important;
box-shadow: inset 5px 5px 5px rgba(0, 0, 0, 0.6) !important;
}
.unselectable {
-webkit-touch-callout: none;
-webkit-user-select: none;
-khtml-user-select: none;
-moz-user-select: none;
-ms-user-select: none;
user-select: none;
}
#local-mode-button .local {
color: red;
}

75
static/main.js
View File

@ -1,6 +1,3 @@
var localModeEnabled = false;
// References to howler objects
/* jshint esversion: 6 */
var localModeEnabled = false;
@ -109,69 +106,6 @@ function addKeyListeners() {
}
function resetSearch() {
var searchfield = document.querySelector("#search");
var buttons = document.querySelectorAll(".sound");
buttons.forEach(function(item) {
item.style.display = "inline-block";
});
searchfield.value = "";
searchfield.focus();
}
/*
* Reads the stream url from input with id #streaming-url and forwards it to the server using AJAX.
*/
function playStream() {
var streamUrl = document.querySelector("#streaming-url").value;
ajaxRequest("/?video="+encodeURI(streamUrl));
}
/*
* Adds all necessary KeyListeners to document
*/
function addKeyListeners() {
// keyboard listener for global key strokes/inputs
document.onkeydown = function(evt) {
evt = evt || window.event;
if (evt.keyCode == 27) {
// esc key
resetSearch();
} else if ((evt.keyCode == 75 || evt.keyCode == 67) && evt.ctrlKey) {
// ctrl+k and ctrl+c key binding
killAllAudio();
} else if (evt.keyCode == 88 && evt.ctrlKey){
// ctrl+x key binding
toggleLocalMode();
}
};
// keyboard listener for playing sounds using enter key
var buttons = document.querySelectorAll(".sound");
buttons.forEach(function(item) {
item.firstChild.addEventListener('keypress', async function (e) {
var key = e.keyCode;
var source = e.target;
// keylistener for enter or ctrl+enter (which is k10 on chrome)
if (key === 13 || (key === 10 && e.ctrlKey)) {
if(e.ctrlKey){
killAllAudio();
await sleep(100);
}
source.classList.add("sound-pressed");
source.onclick();
await sleep(300);
source.classList.remove("sound-pressed");
}
});
});
}
function resetSearch() {
var searchfield = document.querySelector("#search");
var buttons = document.querySelectorAll(".sound");
@ -210,15 +144,6 @@ function ajaxRequest(url) {
alert("Unfortunately we were unable to handle your request. Please try again later and contact the server administrator if the problem persists.");
return false;
}
var ajaxRequest;
try {
ajaxRequest = new XMLHttpRequest();
ajaxRequest.open("GET", url, true);
ajaxRequest.send(null);
} catch (e) {
alert("Unfortunately we were unable to handle your request. Please try again later and contact the server administrator if the problem persists.");
return false;
}
}
/*