eessppeelllloo/r_e_c_u_r
1
0
Fork 0
mirror of https://github.com/cyberboy666/r_e_c_u_r.git synced 2025-12-18 22:30:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

some last minute fixes

Browse Source
This commit is contained in:
langolierz
2020-03-15 18:41:14 +00:00
parent d434252d8e
commit 36829466aa
3 changed files with 14 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
actions.py
View File

@@ -1101,7 +1101,9 @@ class Actions(object):
#print ("for method_name %s, arguments is %s and len is %s, got method %s" % (method_name, arguments, len(signature(method).parameters), method)) #print ("for method_name %s, arguments is %s and len is %s, got method %s" % (method_name, arguments, len(signature(method).parameters), method))
# for the case where cc is being used as switch, we ignore note_off # for the case where cc is being used as switch, we ignore note_off
if len(signature(method).parameters) == 0 and not argument: print(type(argument))
if len(signature(method).parameters) == 0 and isinstance(argument, float) and argument == 0:
print('cc off ?')
return return
if arguments is not None and len(signature(method).parameters)==len(arguments): # only pass arguments if count matches method sig if arguments is not None and len(signature(method).parameters)==len(arguments): # only pass arguments if count matches method sig
method(*arguments) method(*arguments)

2
display_centre/display.py
View File

@@ -394,7 +394,7 @@ class Display(object):
if self.data.feedback_active: if self.data.feedback_active:
feedback = 'FDBCK' feedback = 'FDBCK'
self.display_text.insert(END, '{:8} {:<28} {:>5} \n'.format('CONTROL:', self.data.control_mode, feedback)) self.display_text.insert(END, '{:8} {:<28} {:>5} \n'.format('CONTROL:', str(self.data.control_mode), feedback))
self.display_text.tag_add('TITLE', 16.0,16.0 + self.SELECTOR_WIDTH) self.display_text.tag_add('TITLE', 16.0,16.0 + self.SELECTOR_WIDTH)
def _highlight_this_row(self, row, gray=False): def _highlight_this_row(self, row, gray=False):

16
user_input/osc_input.py
View File

@@ -56,12 +56,16 @@ class OscInput(object):
# this_dispatcher.map("/shutdown", self.exit_osc_server) # this_dispatcher.map("/shutdown", self.exit_osc_server)
this_dispatcher.map("/*", self.on_osc_input) this_dispatcher.map("/*", self.on_osc_input)
osc_server.ThreadingOSCUDPServer.allow_reuse_address = True try:
server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher) osc_server.ThreadingOSCUDPServer.allow_reuse_address = True
server_thread = threading.Thread(target=server.serve_forever) server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher)
server_thread.start() server_thread = threading.Thread(target=server.serve_forever)
self.osc_server = server server_thread.start()
self.message_handler.set_message('INFO', 'osc active on ' + ip_address) self.osc_server = server
self.message_handler.set_message('INFO', 'osc active on ' + ip_address)
except:
self.message_handler.set_message('INFO', 'failed to start osc listener')
def exit_osc_server(self, unused_addr, args): def exit_osc_server(self, unused_addr, args):
print('%%%%%%%%%%%%%%%%%%%%% exiting external_osc') print('%%%%%%%%%%%%%%%%%%%%% exiting external_osc')