diff --git a/padcontroller/device.py b/padcontroller/device.py index aac6844..7d7373f 100644 --- a/padcontroller/device.py +++ b/padcontroller/device.py @@ -96,11 +96,15 @@ class Link: rtmidi = load_rtmidi() self.midiout = rtmidi.MidiOut(rtapi=rtmidi.API_LINUX_ALSA) self.midiin = rtmidi.MidiIn(rtapi=rtmidi.API_LINUX_ALSA) - self.name = private_port(self.midiout.get_ports()) - index = self.midiout.get_ports().index(self.name) - self.midiin.open_port(index) - self.midiin.ignore_types(sysex=False, timing=True, active_sense=True) - self.midiout.open_port(index) + try: + self.name = private_port(self.midiout.get_ports()) + index = self.midiout.get_ports().index(self.name) + self.midiin.open_port(index) + self.midiin.ignore_types(sysex=False, timing=True, active_sense=True) + self.midiout.open_port(index) + except BaseException: + self.close() + raise def close(self) -> None: for port in (self.midiout, self.midiin): diff --git a/scripts/pad/pad_lamps.py b/scripts/pad/pad_lamps.py index 316bcc9..cbd6685 100644 --- a/scripts/pad/pad_lamps.py +++ b/scripts/pad/pad_lamps.py @@ -50,11 +50,13 @@ def set_sound_lamps(pump: bool, threshold: bool) -> None: lamps = {0: PUMP_RGB if pump else (0, 0, 0), 1: THRESHOLD_RGB if threshold else (0, 0, 0)} midiout = rtmidi.MidiOut(rtapi=rtmidi.API_LINUX_ALSA) midiin = rtmidi.MidiIn(rtapi=rtmidi.API_LINUX_ALSA) - index = midiout.get_ports().index(pad_colours.private_port(midiout.get_ports())) - midiin.open_port(index) - midiin.ignore_types(sysex=False, timing=True, active_sense=True) - midiout.open_port(index) try: + # Free both clients when the Private port is missing too, or every + # sound pad press on Bluetooth leaks two and fills the sequencer. + index = midiout.get_ports().index(pad_colours.private_port(midiout.get_ports())) + midiin.open_port(index) + midiin.ignore_types(sysex=False, timing=True, active_sense=True) + midiout.open_port(index) for base in pad_colours.bank_bases(1): for pad, rgb in lamps.items(): address = RAM + base + pad * pad_colours.RECORD + pad_colours.RGB_AT