diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-20 16:50:41 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2009-12-20 16:50:41 +0000 |
| commit | 738387f9a417537e768d56d3fc4afcb9dc82d66b (patch) | |
| tree | 47227ac3b82b8813b489904f785a3e52694a5707 /libs/surfaces/generic_midi/generic_midi_control_protocol.h | |
| parent | 96cd6c993b0ed9a775f7ea096e2afe01be9d00b9 (diff) | |
remove a couple of boost::signals2 trouble spots; fix some --strict compile time warnings
git-svn-id: svn://localhost/ardour2/branches/3.0@6378 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/generic_midi/generic_midi_control_protocol.h')
| -rw-r--r-- | libs/surfaces/generic_midi/generic_midi_control_protocol.h | 3 |
1 files changed, 2 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 828bb4e6be..c42d796e81 100644 --- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h +++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h @@ -51,7 +51,8 @@ class GenericMidiControlProtocol : public ARDOUR::ControlProtocol { typedef std::set<MIDIControllable*> MIDIControllables; MIDIControllables controllables; - typedef std::list<std::pair<MIDIControllable*,sigc::connection> > MIDIPendingControllables; + typedef std::pair<MIDIControllable*,PBD::Connection> MIDIPendingControllable; + typedef std::list<MIDIPendingControllable* > MIDIPendingControllables; MIDIPendingControllables pending_controllables; Glib::Mutex controllables_lock; Glib::Mutex pending_lock; |