diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-13 16:56:34 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-12-13 16:56:34 -0500 |
| commit | afabc09fbf97ea8fafb2cb8b54a8d67a45df49fb (patch) | |
| tree | 339ed89498eed7d7954ea55bd0b0dab8bf40edcc | |
| parent | 89adeb2a9f1d85310ca1d240de10f43ac5ab0be2 (diff) | |
change Generic MIDI control so that it handles a SendFeedback request synchronously within a process callback
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.cc | 6 |
1 files changed, 2 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 ba1858a174..9d45a1c890 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.cc +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.cc @@ -80,16 +80,14 @@ GenericMidiControlProtocol::GenericMidiControlProtocol (Session& s) Controllable::CreateBinding.connect_same_thread (*this, boost::bind (&GenericMidiControlProtocol::create_binding, this, _1, _2, _3)); Controllable::DeleteBinding.connect_same_thread (*this, boost::bind (&GenericMidiControlProtocol::delete_binding, this, _1)); - Session::SendFeedback.connect (*this, MISSING_INVALIDATOR, boost::bind (&GenericMidiControlProtocol::send_feedback, this), midi_ui_context());; -#if 0 - /* XXXX SOMETHING GOES WRONG HERE (april 2012) - STILL DEBUGGING */ /* this signal is emitted by the process() callback, and if * send_feedback() is going to do anything, it should do it in the * context of the process() callback itself. */ Session::SendFeedback.connect_same_thread (*this, boost::bind (&GenericMidiControlProtocol::send_feedback, this)); -#endif + //Session::SendFeedback.connect (*this, MISSING_INVALIDATOR, boost::bind (&GenericMidiControlProtocol::send_feedback, this), midi_ui_context());; + /* this one is cross-thread */ Route::RemoteControlIDChange.connect (*this, MISSING_INVALIDATOR, boost::bind (&GenericMidiControlProtocol::reset_controllables, this), midi_ui_context()); |