diff --git a/padcontroller/midi.py b/padcontroller/midi.py index 1abd846..4c63b8a 100644 --- a/padcontroller/midi.py +++ b/padcontroller/midi.py @@ -84,16 +84,6 @@ def pick_source(names: list[str]) -> int | None: return None -def find_source_port(midiin: rtmidi.MidiIn) -> int: - ports = midiin.get_ports() - i = pick_source(ports) - if i is None: - raise SystemExit( - "No SMC-PAD MIDI source found. Ports:\n " + "\n ".join(ports or ["(none)"]) - ) - return i - - @dataclass class AlsaPort: addr: str # "client:port" @@ -171,6 +161,13 @@ def ensure_links(src_name: str | None) -> tuple[bool, set[tuple[str | None, str] return to_qlc, fed +def unlink_source(src_name: str | None) -> None: + """Take the pad's old port off padcontroller-in, so a pad moving from USB to Bluetooth isn't heard twice.""" + m = re.search(r"(\d+:\d+)$", src_name or "") + if m: + subprocess.run(["aconnect", "-d", m.group(1), "padcontroller-in:0"], capture_output=True) + + def load_colours(layer: PlayLayer) -> None: try: saved = json.loads(COLOURS_FILE.read_text()) @@ -202,9 +199,13 @@ def main() -> None: midiin = rtmidi.MidiIn(rtapi=rtmidi.API_LINUX_ALSA, name="padcontroller-in") midiout = rtmidi.MidiOut(rtapi=rtmidi.API_LINUX_ALSA, name="padcontroller-out") - src = find_source_port(midiin) - src_name = midiin.get_ports()[src] - midiin.open_port(src) + names = midiin.get_ports() + src = pick_source(names) + src_name = names[src] if src is not None else None + # Our own input port, with the pad linked into it by ensure_links: it keeps reading while + # the pad is away (rtmidi stops reading when an opened port closes), so the virtual pad + # still gets through. + midiin.open_virtual_port("RtMidi input") midiin.ignore_types(timing=True, active_sense=True, sysex=True) midiout.open_virtual_port(VIRTUAL_NAME) @@ -221,7 +222,7 @@ def main() -> None: # Links made this soon after start are ours being restored, with QLC+'s buttons as they were. reopen_from = time.monotonic() + 5.0 - print(f"Source: {src_name}", flush=True) + print(f"Source: {src_name or '(pad gone, waiting)'}", flush=True) print(f"Virtual: {VIRTUAL_NAME} (tau={args.tau}s @ {args.rate} Hz)", flush=True) print("Pass notes through (Play held shifts bank 2 up 16); smooth CC. Ctrl+C to stop.", flush=True) _, fed = ensure_links(src_name) @@ -243,12 +244,8 @@ def main() -> None: best = pick_source(names) best_name = names[best] if best is not None else None if best_name != src_name: - midiin.close_port() - if best is not None: - midiin.open_port(best) - print(f"Source: {best_name}", flush=True) - else: - print("Source: (pad gone, waiting)", flush=True) + unlink_source(src_name) + print(f"Source: {best_name or '(pad gone, waiting)'}", flush=True) src_name = best_name linked, now_fed = ensure_links(src_name) if (linked or now_fed - fed) and now >= reopen_from: