From 73029d45baf97da6b0a2c8ec9688c33da69fff8d Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Sat, 23 Mar 2019 03:11:54 +0100 Subject: [PATCH] Re-add global lookup for generic-midi ctrl state --- libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 2 +- libs/surfaces/generic_midi/midicontrollable.cc | 3 --- 2 files changed, 1 insertion(+), 4 deletions(-) diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc index be835b7ffb..44b9351554 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -631,7 +631,7 @@ GenericMidiControlProtocol::set_state (const XMLNode& node, int version) if ((*niter)->get_property ("id", id)) { DEBUG_TRACE (DEBUG::GenericMidi, string_compose ("Relearned binding for session: Control ID: %1\n", id.to_s())); - boost::shared_ptr c = session->controllable_by_id (id); // XXX are these all? + boost::shared_ptr c = Controllable::by_id (id); if (c) { MIDIControllable* mc = new MIDIControllable (this, *_input_port->parser(), c, false); diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index a33855a0f4..a110f32904 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -144,7 +144,6 @@ MIDIControllable::set_controllable (boost::shared_ptr c) last_incoming = 256; if (c) { - printf ("MIDIControllable::set %s\n", c->name().c_str()); c->Destroyed.connect_same_thread (controllable_death_connection, boost::bind (&MIDIControllable::drop_controllable, this, _1)); } @@ -278,8 +277,6 @@ MIDIControllable::lookup_controllable() void MIDIControllable::drop_controllable (Controllable* c) { - printf ("MIDIControllable::drop_controllable ? %s\n", c->name().c_str()); - boost::shared_ptr controllable = _controllable.lock (); if (controllable && c == controllable.get()) { set_controllable (boost::shared_ptr());