Avoid unnecessary checks when matching midi in messages from push

Author: ffont

push2_python/__init__.py

@@ -215,10 +215,10 @@ def on_midi_message(self, message):
                 # are not interested in (probably some internal state which Ableton uses but we don't care about?)
 
                 # Send received message to each "part" so it is processes accordingly
-                self.pads.on_midi_message(message)
-                self.buttons.on_midi_message(message)
-                self.encoders.on_midi_message(message)
-                self.touchtrip.on_midi_message(message)
+                for func in [self.pads.on_midi_message, self.buttons.on_midi_message, self.encoders.on_midi_message, self.touchtrip.on_midi_message]:
+                    action_taken = func(message)
+                    if action_taken:
+                        break  # Early return from for loop to avoid running unnecessary checks
 
                 # Also check for some other extra general message types here
                 if message.type == MIDO_CONTROLCHANGE:

push2_python/buttons.py

@@ -57,4 +57,5 @@ def on_midi_message(self, message):
                 action = ACTION_BUTTON_PRESSED if message.value == 127 else ACTION_BUTTON_RELEASED
                 self.push.trigger_action(action, button['Name'])  # Trigger generic button action
                 self.push.trigger_action(get_individual_button_action_name(action, button['Name']))  # Trigger individual button action as well
+                return True
 

push2_python/encoders.py

@@ -52,10 +52,12 @@ def on_midi_message(self, message):
                     self.push.trigger_action(action, encoder['Name'], value)  # Trigger generic rotate encoder action
                     self.push.trigger_action(get_individual_encoder_action_name(
                         action, encoder['Name']), value)  # Trigger individual rotate encoder action as well
+                    return True
         elif message.type in [MIDO_NOTEON, MIDO_NOTEOFF]:  # Encoder touched or released
             if message.note in self.encoder_touch_map:  # Note number corresponds to one of the encoders in touch mode
                 encoder = self.encoder_touch_map[message.note]
                 action = ACTION_ENCODER_TOUCHED if message.velocity == 127 else ACTION_ENCODER_RELEASED
                 self.push.trigger_action(action, encoder['Name'])  # Trigger generic touch/release encoder action
                 self.push.trigger_action(get_individual_encoder_action_name(
                     action, encoder['Name']))  # Trigger individual touch/release encoder action as well
+                return True

push2_python/pads.py

@@ -169,13 +169,17 @@ def on_midi_message(self, message):
                         self.push.trigger_action(ACTION_PAD_PRESSED, pad_n, pad_ij, velocity)  # Trigger generic pad action
                         self.push.trigger_action(get_individual_pad_action_name(
                             ACTION_PAD_PRESSED, pad_n=pad_n), velocity)  # Trigger individual pad action as well
+                        return True
                     elif message.type == MIDO_NOTEOFF:
                         self.push.trigger_action(ACTION_PAD_RELEASED, pad_n, pad_ij, velocity)
                         self.push.trigger_action(get_individual_pad_action_name(
                             ACTION_PAD_RELEASED, pad_n=pad_n), velocity)  # Trigger individual pad action as well
+                        return True
                     elif message.type == MIDO_POLYAT:
                         self.push.trigger_action(ACTION_PAD_AFTERTOUCH, pad_n, pad_ij, velocity)
                         self.push.trigger_action(get_individual_pad_action_name(
                             ACTION_PAD_AFTERTOUCH, pad_n=pad_n), velocity)  # Trigger individual pad action as well
+                        return True
             elif message.type == MIDO_AFTERTOUCH:
                 self.push.trigger_action(ACTION_PAD_AFTERTOUCH, None, None, message.value)
+                return True

push2_python/touchstrip.py

@@ -13,3 +13,4 @@ def on_midi_message(self, message):
         if message.type == MIDI_PITCWHEEL:
             value = message.pitch
             self.push.trigger_action(ACTION_TOUCHSTRIP_TOUCHED, value)
+            return True