diff --git a/actions.py b/actions.py index 992a4e8..efdc2ad 100644 --- a/actions.py +++ b/actions.py @@ -905,10 +905,26 @@ class Actions(object): found_method = me parsed_args = list(map(int,matches.groups())) if argument is not None: - #args = [argument] + parsed_args args = parsed_args + [argument] else: args = parsed_args return (found_method, args) + def call_method_name(self, method_name, argument=None): + # if the target method doesnt exist, call the handler + if not hasattr(self, method_name): + self.call_parse_method_name(method_name, argument) + return + + if argument is not None: + getattr(self, method_name)(argument) + else: + getattr(self, method_name)() + + + def call_parse_method_name(self, method_name, argument): + method, arguments = self.get_callback_for_method(method_name, argument) + method(*arguments) + + diff --git a/user_input/analog_input.py b/user_input/analog_input.py index 7a9a02e..9507a48 100644 --- a/user_input/analog_input.py +++ b/user_input/analog_input.py @@ -69,15 +69,9 @@ class AnalogInput(object): norm_channel_value = None print('the action being called is {}'.format(method_name)) - self.call_method_name(method_name, norm_channel_value) + self.actions.call_method_name(method_name, norm_channel_value) ## not sure whether we want to update the screen in general; here - probably not most of the time ... #if 'cc' not in message_name: # self.display.refresh_display() - def call_method_name(self, method_name, argument=None): - if argument is not None: - getattr(self.actions, method_name)(argument) - else: - getattr(self.actions, method_name)() - diff --git a/user_input/midi_input.py b/user_input/midi_input.py index 1b76f01..9217c76 100644 --- a/user_input/midi_input.py +++ b/user_input/midi_input.py @@ -123,26 +123,8 @@ class MidiInput(object): else: norm_message_value = None - self.call_method_name(method_name, norm_message_value) + self.actions.call_method_name(method_name, norm_message_value) ## only update screen if not continuous - seeing if cc can respond faster if not refreshing screen on every action if 'continuous' not in message_name: self.display.refresh_display() - def call_method_name(self, method_name, argument=None): - # if the target method doesnt exist, call the handler - if not hasattr(self.actions, method_name): - self.call_parse_method_name(method_name, argument) - return - - if argument is not None: - getattr(self.actions, method_name)(argument) - else: - getattr(self.actions, method_name)() - - - def call_parse_method_name(self, method_name, argument): - method, arguments = self.actions.get_callback_for_method(method_name, argument) - method(*arguments) - - -