summaryrefslogtreecommitdiff
path: root/libs/surfaces/generic_midi/midicontrollable.h
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2012-06-26 01:55:53 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2012-06-26 01:55:53 +0000
commita054a74dd29197679eb6f67e6fcaa54df7d70810 (patch)
treef39ddcc0681218cbc58243955c6870f38bdc5ef9 /libs/surfaces/generic_midi/midicontrollable.h
parent06ad59e93647ed604b026bc1680919638f3a7edc (diff)
disconnect from a Controllable when it is destroyed
git-svn-id: svn://localhost/ardour2/branches/3.0@12938 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/generic_midi/midicontrollable.h')
-rw-r--r--libs/surfaces/generic_midi/midicontrollable.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 571f71edfe..ff4411a9ca 100644
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -107,6 +107,7 @@ class MIDIControllable : public PBD::Stateful
int midi_msg_id; /* controller ID or note number */
PBD::ScopedConnection midi_sense_connection[2];
PBD::ScopedConnection midi_learn_connection;
+ PBD::ScopedConnection controllable_death_connection;
/** the type of MIDI message that is used for this control */
MIDI::eventType control_type;
MIDI::byte control_additional;
@@ -118,7 +119,8 @@ class MIDIControllable : public PBD::Stateful
bool _bank_relative;
int lookup_controllable();
-
+ void drop_controllable();
+
void midi_receiver (MIDI::Parser &p, MIDI::byte *, size_t);
void midi_sense_note (MIDI::Parser &, MIDI::EventTwoBytes *, bool is_on);
void midi_sense_note_on (MIDI::Parser &p, MIDI::EventTwoBytes *tb);