Volume cannot be changed when player isn't playing
This commit is contained in:
parent
48d4577c53
commit
7505bc28d3
3 changed files with 23 additions and 14 deletions
|
|
@ -170,6 +170,7 @@ function ipSetter(){
|
||||||
async function checkSettings(skipServer=false) {
|
async function checkSettings(skipServer=false) {
|
||||||
//check client stuff first so if the server doesn't exist it can still be changed and seen
|
//check client stuff first so if the server doesn't exist it can still be changed and seen
|
||||||
if (ip.slice(-5)=="19054") {
|
if (ip.slice(-5)=="19054") {
|
||||||
|
// don't show the port if it is the default
|
||||||
document.getElementById("iptextbox").value = ip.slice(0,-6)
|
document.getElementById("iptextbox").value = ip.slice(0,-6)
|
||||||
} else {
|
} else {
|
||||||
document.getElementById("iptextbox").value = ip;
|
document.getElementById("iptextbox").value = ip;
|
||||||
|
|
@ -309,8 +310,12 @@ document.getElementById("playlist-mode").style.display = "none";
|
||||||
document.getElementById("settings-mode").style.display = "none";
|
document.getElementById("settings-mode").style.display = "none";
|
||||||
//.ontouch for mobile??
|
//.ontouch for mobile??
|
||||||
document.getElementById("volumerange").onchange = function() {
|
document.getElementById("volumerange").onchange = function() {
|
||||||
getFromServer({setting:"volume",level:this.value}, "settings")
|
let returnValue = getFromServer({setting:"volume",level:this.value}, "settings")
|
||||||
if (this.value == 0) {
|
if (returnValue !=0) {
|
||||||
|
alertText("Nothing is playing")
|
||||||
|
document.getElementById("volumerange").value = -1
|
||||||
|
}
|
||||||
|
else if (this.value == 0) {
|
||||||
alertText("The volume is now set to 0 (Pause?)")
|
alertText("The volume is now set to 0 (Pause?)")
|
||||||
} else {
|
} else {
|
||||||
alertText("The volume is now set to " + this.value.toString())
|
alertText("The volume is now set to " + this.value.toString())
|
||||||
|
|
|
||||||
|
|
@ -74,7 +74,7 @@ h4 {
|
||||||
|
|
||||||
/* Songlist stuff */
|
/* Songlist stuff */
|
||||||
.songlist {
|
.songlist {
|
||||||
width: 70%;
|
width: 80%;
|
||||||
min-width: 300px;
|
min-width: 300px;
|
||||||
margin:auto auto 150px;
|
margin:auto auto 150px;
|
||||||
display: flex;
|
display: flex;
|
||||||
|
|
@ -86,7 +86,7 @@ h4 {
|
||||||
width:30%;
|
width:30%;
|
||||||
max-width: 150px;
|
max-width: 150px;
|
||||||
margin: 5px auto;
|
margin: 5px auto;
|
||||||
min-width: 100px;
|
min-width: 75px;
|
||||||
background-color: inherit;
|
background-color: inherit;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
||||||
|
|
@ -97,10 +97,11 @@ def playerControls():
|
||||||
def settingsControl():
|
def settingsControl():
|
||||||
# set the volume and partymode
|
# set the volume and partymode
|
||||||
global partyMode
|
global partyMode
|
||||||
|
global player
|
||||||
recieveData = request.get_json(force=True)
|
recieveData = request.get_json(force=True)
|
||||||
if recieveData["setting"] == "volume":
|
if recieveData["setting"] == "volume":
|
||||||
player.audio_set_volume(int(recieveData["level"]))
|
volumePassed = player.audio_set_volume(int(recieveData["level"]))
|
||||||
return "200"
|
return {"volumePassed":volumePassed}
|
||||||
elif recieveData["setting"] == "partymode-toggle":
|
elif recieveData["setting"] == "partymode-toggle":
|
||||||
partyMode = not(partyMode)
|
partyMode = not(partyMode)
|
||||||
return "200"
|
return "200"
|
||||||
|
|
@ -117,15 +118,18 @@ def searchSongDB():
|
||||||
# the way i put the data in a list was really dumb looking back, i could and should have used a list of dictioaries like i was before
|
# the way i put the data in a list was really dumb looking back, i could and should have used a list of dictioaries like i was before
|
||||||
# i might try to change it but this layout is embedded deep in the client
|
# i might try to change it but this layout is embedded deep in the client
|
||||||
tempData = {}
|
tempData = {}
|
||||||
for i in songDatabaseList["songData"]:
|
if (recieveData['search'] == ""):
|
||||||
if ((songDatabaseList["songData"][i]["title"].lower().find(recieveData['search'].lower())) > -1) or (recieveData['search'] == ""):
|
tempData = songDatabaseList["songData"].copy()
|
||||||
tempData[i] = songDatabaseList["songData"][i]
|
else:
|
||||||
|
for i in songDatabaseList["songData"]:
|
||||||
try:
|
if ((songDatabaseList["songData"][i]["title"].lower().find(recieveData['search'].lower())) > -1):
|
||||||
if (songDatabaseList["songData"][i]["artist"].lower().find(recieveData['search'].lower()) > -1):
|
|
||||||
tempData[i] = songDatabaseList["songData"][i]
|
tempData[i] = songDatabaseList["songData"][i]
|
||||||
except:
|
|
||||||
pass
|
try:
|
||||||
|
if (songDatabaseList["songData"][i]["artist"].lower().find(recieveData['search'].lower()) > -1):
|
||||||
|
tempData[i] = songDatabaseList["songData"][i]
|
||||||
|
except:
|
||||||
|
pass
|
||||||
# print(tempData)
|
# print(tempData)
|
||||||
return tempData
|
return tempData
|
||||||
|
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue