protonphoton/LJ
7
0
Fork 1
Code Issues Pull requests 1 Releases Wiki Activity

Aurora layers bugfixs

Browse source
This commit is contained in:
sam 2020-10-06 03:11:02 +02:00
parent 132ea32d66
commit cc93d13e22
10 changed files with 210 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
libs3/commands.py
View file

@ -194,9 +194,10 @@ def NoteOn(note):
else:
gstt.Laser = note -24
plugins.sendWSall("/status Laser " + str(gstt.Laser))
plugins.SendAll("/scim "+str(gstt.Laser))
print("Current Laser switched to", gstt.Laser)
plugins.sendWSall("/status Laser " + str(gstt.Laser))
plugins.SendAll(["/scim", str(gstt.Laser), "1"])
def Scim(path, tags, args, source):
@ -579,8 +580,10 @@ def Updatepage(file_name):
o.close()
#now the modification is done in the file
# Not used anymare see configure.py
def UpdateAllwww():
pass
print("Updating www files to use", gstt.wwwIP)
Updatepage(gstt.ljpath+"/www/LJ.js")
Updatepage(gstt.ljpath+"/www/trckr/trckrcam1.html")

24
libs3/plugins.py
View file

@ -182,21 +182,26 @@ def OSCsend(name, oscaddress, oscargs =''):
# for each plugin will automatically add /pluginame before oscpath to send like /aurora/scim 1, if oscpath = "/scim 1"
def SendAll(oscpath):
print("Sending to all plugins ", "/pluginame"+oscpath)
print("Sending to all plugins...")
for plugin in list(gstt.plugins.keys()):
if gstt.debug > 0:
print("sending ","/"+plugin+oscpath,"to", plugin)
print("sending /"+plugin+oscpath,"to", plugin)
print("sending /"+plugin+oscpath[0],"to", plugin)
#sendWSall("/"+ plugin + "/start 0")
Send(plugin, "/"+plugin+oscpath)
Send(plugin, ["/"+plugin+oscpath[0], oscpath[1]])
# Send a command to given plugin. Will also start it if command contain /start 1
def Send(name, oscpath):
if oscpath[0].find(name) != -1:
print("OSC is sending to", name,":", oscpath)
#if oscpath.find(name) != -1:
if oscpath[0].find(name) != -1:
print("pinging..", name)
# Plugin is online ?
if Ping(name):
@ -227,7 +232,9 @@ def Send(name, oscpath):
#print("To trckr", name, oscpath, len(oscpath))
OSCsend(name, oscpath[0], oscpath[1:])
elif name == "aurora":
#print("To Aurora", oscpath, len(oscpath))
#print("To Aurora", oscpath)
#OSCsend(name, oscpath[:-2], oscpath[-1] )
print("To Aurora", oscpath, len(oscpath))
OSCsend(name, oscpath[0], oscpath[1:])
return True
@ -236,10 +243,9 @@ def Send(name, oscpath):
if gstt.debug >0:
print("Plugin manager send says plugin " + name + " is offline.")
#print "Command", oscpath
sendWSall("/redstatus Plugin " + name + " offline")
sendWSall("/"+ name + "/start 0")
#sendWSall("/redstatus Plugin " + name + " offline")
#sendWSall("/"+ name + "/start 0")
# Try to Start it if /start 1
if oscpath[0].find("start") != -1 and oscpath[1] == "1":