merge with master

[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 ff4411a9ca2fd148d34dd99cd345896d1ad30dee..aeed05db4a1f2426bba1fa8ee91010f3e0e42230 100644 (file)
--- a/libs/surfaces/generic_midi/midicontrollable.h
+++ b/libs/surfaces/generic_midi/midicontrollable.h
@@ -36,17 +36,20 @@ namespace PBD {
 
 namespace MIDI {
        class Channel;
-       class Port;
        class Parser;
 }
 
 class GenericMidiControlProtocol;
 
+namespace ARDOUR {
+       class AsyncMIDIPort;
+}
+
 class MIDIControllable : public PBD::Stateful
 {
   public:
-       MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, PBD::Controllable&, bool momentary);
-       MIDIControllable (GenericMidiControlProtocol *, MIDI::Port&, bool momentary = false);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, PBD::Controllable&, bool momentary);
+        MIDIControllable (GenericMidiControlProtocol *, MIDI::Parser&, bool momentary = false);
        virtual ~MIDIControllable ();
 
        int init (const std::string&);
@@ -72,7 +75,7 @@ class MIDIControllable : public PBD::Stateful
 
        bool learned() const { return _learned; }
 
-       MIDI::Port& get_port() const { return _port; }
+        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; }
@@ -88,6 +91,8 @@ class MIDIControllable : public PBD::Stateful
        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:
 
@@ -96,8 +101,8 @@ class MIDIControllable : public PBD::Stateful
        GenericMidiControlProtocol* _surface;
        PBD::Controllable* controllable;
        PBD::ControllableDescriptor* _descriptor;
-       std::string        _current_uri;
-       MIDI::Port&     _port;
+       std::string     _current_uri;
+        MIDI::Parser&   _parser;
        bool             setting;
        int              last_value;
        float            last_controllable_value;
@@ -118,7 +123,6 @@ class MIDIControllable : public PBD::Stateful
        std::string     _what;
        bool            _bank_relative;
 
-        int lookup_controllable();
         void drop_controllable();
 
        void midi_receiver (MIDI::Parser &p, MIDI::byte *, size_t);