summaryrefslogtreecommitdiff
path: root/libs/surfaces/generic_midi/midicontrollable.cc
diff options
context:
space:
mode:
authorPaul Davis <paul@linuxaudiosystems.com>2011-08-13 16:27:29 +0000
committerPaul Davis <paul@linuxaudiosystems.com>2011-08-13 16:27:29 +0000
commitf75bbfd8ac52ea33692c3ee15953ceb2994117ab (patch)
tree13ec2167fc76ccbb1464ff81b6854234b6716b2e /libs/surfaces/generic_midi/midicontrollable.cc
parent77f3fa0943e4b99d3575dfb34e0ef09f3eb4ead7 (diff)
track changes to config parameters for MMC device id's correctly (from roy vegard)
git-svn-id: svn://localhost/ardour2/branches/3.0@9985 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/surfaces/generic_midi/midicontrollable.cc')
-rw-r--r--libs/surfaces/generic_midi/midicontrollable.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc
index 9060f010a0..426d730743 100644
--- a/libs/surfaces/generic_midi/midicontrollable.cc
+++ b/libs/surfaces/generic_midi/midicontrollable.cc
@@ -351,7 +351,7 @@ MIDIControllable::send_feedback ()
{
byte msg[3];
- if (!_learned || setting || !feedback || control_type == none) {
+ if (!_learned || setting || !feedback || control_type == none || !controllable) {
return;
}
@@ -370,7 +370,7 @@ MIDIControllable::send_feedback ()
MIDI::byte*
MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*force*/)
{
- if (control_type != none && feedback && bufsize > 2) {
+ if (controllable && control_type != none && feedback && bufsize > 2) {
MIDI::byte gm;