Mackie Control: fix math error that tried to change bank to very high number

[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 51ee60bb1ed773ecd742a951ff165faa5de74714..a19e3a1a28ce005a0398e44a772475da108b7068 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -1,6 +1,6 @@
 /*
     Copyright (C) 1998-2006 Paul Davis
- 
+
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
@@ -59,8 +59,16 @@ class MIDIControllable : public PBD::Stateful
        uint32_t rid() const { return _rid; }
        std::string what() const { return _what; }
 
+       enum Encoder {
+               No_enc,
+               Enc_R,
+               Enc_L,
+               Enc_2,
+               Enc_B,
+       };
+
        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 ();
@@ -75,10 +83,10 @@ class MIDIControllable : public PBD::Stateful
 
        bool learned() const { return _learned; }
 
-       bool is_encoder() const { return _encoder; }
-       void set_encoder(bool val) { _encoder = val; }
+       Encoder get_encoder() const { return _encoder; }
+       void set_encoder (Encoder val) { _encoder = val; }
 
-        MIDI::Parser& get_parser() { return _parser; }
+       MIDI::Parser& get_parser() { return _parser; }
        PBD::Controllable* get_controllable() const { return controllable; }
        void set_controllable (PBD::Controllable*);
        const std::string& current_uri() const { return _current_uri; }
@@ -91,12 +99,17 @@ 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;
@@ -112,7 +125,7 @@ class MIDIControllable : public PBD::Stateful
        bool            _momentary;
        bool            _is_gain_controller;
        bool            _learned;
-       bool            _encoder;
+       Encoder                 _encoder;
        int              midi_msg_id;      /* controller ID or note number */
        PBD::ScopedConnection midi_sense_connection[2];
        PBD::ScopedConnection midi_learn_connection;
@@ -122,6 +135,8 @@ class MIDIControllable : public PBD::Stateful
        MIDI::byte       control_additional;
        MIDI::channel_t  control_channel;
        std::string     _control_description;
+       int16_t          control_rpn;
+       int16_t          control_nrpn;
        bool             feedback;
        uint32_t        _rid;
        std::string     _what;
@@ -136,6 +151,12 @@ 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__