Merge branch 'master' of git+ssh://github.com/ideoforms/isobar

Author: ideoforms

isobar/io/midi/input.py

@@ -138,6 +138,8 @@ def _mido_callback(self, message):
                 #------------------------------------------------------------------------
                 # Note off event
                 #------------------------------------------------------------------------
+                logger.info("[midi in] Note off (device = %s, channel = %d, note = %d)" % (self.name, message.channel, message.note))
+
                 if self.notes_down_dict[message.note] is not None:
                     note = self.notes_down_dict[message.note]
                     self.notes_down_dict[message.note] = None
@@ -146,6 +148,7 @@ def _mido_callback(self, message):
                         handler(note)
 
             elif message.type == 'note_on':
+                logger.info("[midi in] Note on (device = %s, channel = %d, note = %d, velocity = %d)" % (self.name, message.channel, message.note, message.velocity))
                 #------------------------------------------------------------------------
                 # Note on event
                 #------------------------------------------------------------------------

isobar/io/midi/output.py

@@ -85,12 +85,12 @@ def tick(self) -> None:
             self.midi.send(msg)
 
     def note_on(self, note: int = 60, velocity: int = 64, channel: int = 0) -> None:
-        logger.info("[midi] Note on  (channel = %d, note = %d, velocity = %d)" % (channel, note, velocity))
+        logger.info("[midi] Note on (device = %s, channel = %d, note = %d, velocity = %d)" % (self.name, channel, note, velocity))
         msg = mido.Message('note_on', note=int(note), velocity=int(velocity), channel=int(channel))
         self.midi.send(msg)
 
     def note_off(self, note: int = 60, channel: int = 0) -> None:
-        logger.info("[midi] Note off (channel = %d, note = %d)" % (channel, note))
+        logger.info("[midi] Note off (device = %s, channel = %d, note = %d)" % (self.name, channel, note))
         msg = mido.Message('note_off', note=int(note), channel=int(channel))
         self.midi.send(msg)
 
@@ -99,7 +99,7 @@ def all_notes_off(self) -> None:
         self.midi.reset()
 
     def control(self, control: int = 0, value: int = 0, channel: int = 0):
-        logger.debug("[midi] Control (channel %d, control %d, value %d)" % (channel, control, value))
+        logger.debug("[midi] Control (device = %s, channel %d, control %d, value %d)" % (self.name, channel, control, value))
         msg = mido.Message('control_change', control=int(control), value=int(value), channel=int(channel))
         self.midi.send(msg)
 

isobar/timelines/track.py

@@ -780,6 +780,8 @@ def set_input_device(self, input_device):
         Args:
             input_device: The input device to set.
         """
+
+        logger.debug("Track %s: set input device: %s" % (self.name, input_device))
         if self._input_device is not None:
             self._input_device.remove_note_on_handler(self._on_note_on)
             self._input_device.remove_note_off_handler(self._on_note_off)