From 36829466aad014a50aa43f2ea5084802596143b7 Mon Sep 17 00:00:00 2001 From: langolierz Date: Sun, 15 Mar 2020 18:41:14 +0000 Subject: [PATCH] some last minute fixes --- actions.py | 4 +++- display_centre/display.py | 2 +- user_input/osc_input.py | 16 ++++++++++------ 3 files changed, 14 insertions(+), 8 deletions(-) diff --git a/actions.py b/actions.py index 7f272f4..1865b03 100644 --- a/actions.py +++ b/actions.py @@ -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)) # 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 if arguments is not None and len(signature(method).parameters)==len(arguments): # only pass arguments if count matches method sig method(*arguments) diff --git a/display_centre/display.py b/display_centre/display.py index 9059ae5..48c5f1d 100644 --- a/display_centre/display.py +++ b/display_centre/display.py @@ -394,7 +394,7 @@ class Display(object): if self.data.feedback_active: 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) def _highlight_this_row(self, row, gray=False): diff --git a/user_input/osc_input.py b/user_input/osc_input.py index b79c91d..d2ba21e 100644 --- a/user_input/osc_input.py +++ b/user_input/osc_input.py @@ -56,12 +56,16 @@ class OscInput(object): # this_dispatcher.map("/shutdown", self.exit_osc_server) this_dispatcher.map("/*", self.on_osc_input) - osc_server.ThreadingOSCUDPServer.allow_reuse_address = True - server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher) - server_thread = threading.Thread(target=server.serve_forever) - server_thread.start() - self.osc_server = server - self.message_handler.set_message('INFO', 'osc active on ' + ip_address) + try: + osc_server.ThreadingOSCUDPServer.allow_reuse_address = True + server = osc_server.ThreadingOSCUDPServer((server_args.ip, server_args.port), this_dispatcher) + server_thread = threading.Thread(target=server.serve_forever) + server_thread.start() + 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): print('%%%%%%%%%%%%%%%%%%%%% exiting external_osc')