diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-21 14:00:18 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2016-07-21 14:00:18 -0400 |
| commit | d53d0faf931314ec180f4236db2dffda21e69071 (patch) | |
| tree | 198b86cbf271301794e0c6b261054dee442726f2 /libs/surfaces/generic_midi/generic_midi_control_protocol.h | |
| parent | 3bf7c4ef49f4c271512f3d3eeb4b83df76f78649 (diff) | |
a more reliable/robust/less complex version of previous commit
Diffstat (limited to 'libs/surfaces/generic_midi/generic_midi_control_protocol.h')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.h | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h index c1e59bc0dc..d3709c5374 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -125,7 +125,16 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol { typedef std::list<MIDIAction*> MIDIActions; MIDIActions actions; - typedef std::pair<MIDIControllable*,PBD::ScopedConnection> MIDIPendingControllable; + struct MIDIPendingControllable { + MIDIControllable* mc; + bool own_mc; + PBD::ScopedConnection connection; + + MIDIPendingControllable (MIDIControllable* c, bool omc) + : mc (c) + , own_mc (omc) + {} + }; typedef std::list<MIDIPendingControllable* > MIDIPendingControllables; MIDIPendingControllables pending_controllables; Glib::Threads::Mutex controllables_lock; |