diff options
| author | Robin Gareus <robin@gareus.org> | 2019-03-23 03:11:54 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2019-03-23 04:24:39 +0100 |
| commit | 73029d45baf97da6b0a2c8ec9688c33da69fff8d (patch) | |
| tree | 960fff4c3ebced5ef933b399dc6fdfcc0afd83f0 /libs/surfaces/generic_midi | |
| parent | 087fd57d37b7c07989b470019870fe8d72917bb3 (diff) | |
Re-add global lookup for generic-midi ctrl state
Diffstat (limited to 'libs/surfaces/generic_midi')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 2 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.cc | 3 |
2 files changed, 1 insertions, 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<PBD::Controllable> c = session->controllable_by_id (id); // XXX are these all? + boost::shared_ptr<PBD::Controllable> 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<PBD::Controllable> 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 = _controllable.lock (); if (controllable && c == controllable.get()) { set_controllable (boost::shared_ptr<PBD::Controllable>()); |