diff options
| author | Robin Gareus <robin@gareus.org> | 2016-12-31 04:35:41 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2016-12-31 15:20:07 +0100 |
| commit | 81123a774aeba2f424cdc93fbc0faad3ec04bfbe (patch) | |
| tree | abbb70127b4c7d6e6d7a34f167f7f87936365b22 /libs/surfaces | |
| parent | ac4484bab47474883f561df32ff82271220f0835 (diff) | |
amend 3afe3f32df (remove unused global feedback option)
That commit accidentally removed unrelated code in generic-midi surface
which just happened to have the same name (get/set_midi_feedback) as the
unused preference.
Regardless, there was more cruft there. GMCP midicontrollables now use
the control surfaces' feedback option.
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.cc | 11 | ||||
| -rw-r--r-- | libs/surfaces/generic_midi/midicontrollable.h | 1 |
2 files changed, 1 insertions, 11 deletions
diff --git a/libs/surfaces/generic_midi/midicontrollable.cc b/libs/surfaces/generic_midi/midicontrollable.cc index b42c9f7b1b..6afd9d4d8a 100644 --- a/libs/surfaces/generic_midi/midicontrollable.cc +++ b/libs/surfaces/generic_midi/midicontrollable.cc @@ -63,7 +63,6 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& control_nrpn = -1; _control_description = "MIDI Control: none"; control_additional = (MIDI::byte) -1; - feedback = true; // for now } MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& p, Controllable& c, bool m) @@ -84,7 +83,6 @@ MIDIControllable::MIDIControllable (GenericMidiControlProtocol* s, MIDI::Parser& control_nrpn = -1; _control_description = "MIDI Control: none"; control_additional = (MIDI::byte) -1; - feedback = true; // for now } MIDIControllable::~MIDIControllable () @@ -610,7 +608,7 @@ MIDIControllable::bind_midi (channel_t chn, eventType ev, MIDI::byte additional) MIDI::byte* MIDIControllable::write_feedback (MIDI::byte* buf, int32_t& bufsize, bool /*force*/) { - if (!controllable || !feedback) { + if (!controllable || !_surface->get_feedback ()) { return buf; } @@ -738,12 +736,6 @@ MIDIControllable::set_state (const XMLNode& node, int /*version*/) return -1; } - if ((prop = node.property ("feedback")) != 0) { - feedback = (prop->value() == "yes"); - } else { - feedback = true; // default - } - bind_midi (control_channel, control_type, control_additional); return 0; @@ -769,7 +761,6 @@ MIDIControllable::get_state () node->add_property ("channel", buf); snprintf (buf, sizeof(buf), "0x%x", (int) control_additional); node->add_property ("additional", buf); - node->add_property ("feedback", (feedback ? "yes" : "no")); } return *node; diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h index a2d96b7830..d07924b936 100644 --- a/libs/surfaces/generic_midi/midicontrollable.h +++ b/libs/surfaces/generic_midi/midicontrollable.h @@ -134,7 +134,6 @@ class MIDIControllable : public PBD::Stateful std::string _control_description; int16_t control_rpn; int16_t control_nrpn; - bool feedback; uint32_t _rid; std::string _what; bool _bank_relative; |