Remove the template description XMLNode before saving the template

[ardour.git] / libs / surfaces / generic_midi / midicontrollable.h

diff --git a/libs/surfaces/generic_midi/midicontrollable.h b/libs/surfaces/generic_midi/midicontrollable.h
index 5a4a76208953ab9397c7910bb72caa89286c2d8c..c88b0b6441836d182a57166bcebe7ee42db8eb23 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -30,7 +30,7 @@
 
 #include "ardour/types.h"
 
-namespace PBD {
+namespace ARDOUR {
        class ControllableDescriptor;
 }
 
@@ -68,16 +68,13 @@ class MIDIControllable : public PBD::Stateful
        };
 
        MIDI::byte* write_feedback (MIDI::byte* buf, int32_t& bufsize, bool force = false);
-       
+
        void midi_rebind (MIDI::channel_t channel=-1);
        void midi_forget ();
        void learn_about_external_control ();
        void stop_learning ();
        void drop_external_control ();
 
-       bool get_midi_feedback () { return feedback; }
-       void set_midi_feedback (bool val) { feedback = val; }
-
        int control_to_midi(float val);
        float midi_to_control(int val);
 
@@ -91,7 +88,7 @@ class MIDIControllable : public PBD::Stateful
        void set_controllable (PBD::Controllable*);
        const std::string& current_uri() const { return _current_uri; }
 
-       PBD::ControllableDescriptor& descriptor() const { return *_descriptor; }
+       ARDOUR::ControllableDescriptor& descriptor() const { return *_descriptor; }
 
        std::string control_description() const { return _control_description; }
 
@@ -99,19 +96,24 @@ class MIDIControllable : public PBD::Stateful
        int set_state (const XMLNode&, int version);
 
        void bind_midi (MIDI::channel_t, MIDI::eventType, MIDI::byte);
+       void bind_rpn_value (MIDI::channel_t, uint16_t rpn);
+       void bind_nrpn_value (MIDI::channel_t, uint16_t rpn);
+       void bind_rpn_change (MIDI::channel_t, uint16_t rpn);
+       void bind_nrpn_change (MIDI::channel_t, uint16_t rpn);
+
        MIDI::channel_t get_control_channel () { return control_channel; }
        MIDI::eventType get_control_type () { return control_type; }
        MIDI::byte get_control_additional () { return control_additional; }
 
         int lookup_controllable();
-       
+
   private:
 
        int max_value_for_type () const;
 
        GenericMidiControlProtocol* _surface;
        PBD::Controllable* controllable;
-       PBD::ControllableDescriptor* _descriptor;
+       ARDOUR::ControllableDescriptor* _descriptor;
        std::string     _current_uri;
         MIDI::Parser&   _parser;
        bool             setting;
@@ -130,12 +132,13 @@ class MIDIControllable : public PBD::Stateful
        MIDI::byte       control_additional;
        MIDI::channel_t  control_channel;
        std::string     _control_description;
-       bool             feedback;
+       int16_t          control_rpn;
+       int16_t          control_nrpn;
        uint32_t        _rid;
        std::string     _what;
        bool            _bank_relative;
 
-        void drop_controllable();
+       void drop_controllable (PBD::Controllable*);
 
        void midi_receiver (MIDI::Parser &p, MIDI::byte *, size_t);
        void midi_sense_note (MIDI::Parser &, MIDI::EventTwoBytes *, bool is_on);
@@ -144,6 +147,11 @@ class MIDIControllable : public PBD::Stateful
        void midi_sense_controller (MIDI::Parser &, MIDI::EventTwoBytes *);
        void midi_sense_program_change (MIDI::Parser &, MIDI::byte);
        void midi_sense_pitchbend (MIDI::Parser &, MIDI::pitchbend_t);
+
+       void nrpn_value_change (MIDI::Parser&, uint16_t nrpn, float val);
+       void rpn_value_change (MIDI::Parser&, uint16_t nrpn, float val);
+       void rpn_change (MIDI::Parser&, uint16_t nrpn, int direction);
+       void nrpn_change (MIDI::Parser&, uint16_t nrpn, int direction);
 };
 
 #endif // __gm_midicontrollable_h__