rework Stateful::set_state() patch to avoid default version argument

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

diff --git a/libs/surfaces/generic_midi/generic_midi_control_protocol.h b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
index 70cbd181c83210b4520bcb08f85241a26fc1926a..6473a869ae4a56c50407d7bc927c8e56e324fa0e 100644 (file)
--- a/libs/surfaces/generic_midi/generic_midi_control_protocol.h
+++ b/libs/surfaces/generic_midi/generic_midi_control_protocol.h
@@ -1,34 +1,72 @@
 #ifndef ardour_generic_midi_control_protocol_h
 #define ardour_generic_midi_control_protocol_h
 
+#include <set>
+#include <glibmm/thread.h>
+#include <ardour/types.h>
+
 #include <control_protocol/control_protocol.h>
 
 namespace MIDI {
        class Port;
 }
 
+namespace PBD {
+       class Controllable;
+}      
+
 namespace ARDOUR {
+       class Session;
+}
+
+class MIDIControllable;
 
-class GenericMidiControlProtocol : public ControlProtocol {
+class GenericMidiControlProtocol : public ARDOUR::ControlProtocol {
   public:
-       GenericMidiControlProtocol (Session&);
+       GenericMidiControlProtocol (ARDOUR::Session&);
        virtual ~GenericMidiControlProtocol();
 
        int set_active (bool yn);
        static bool probe() { return true; }
 
-       void set_port (MIDI::Port*);
        MIDI::Port* port () const { return _port; }
+       void set_feedback_interval (ARDOUR::microseconds_t);
+
+       int set_feedback (bool yn);
+       bool get_feedback () const;
+
+       XMLNode& get_state ();
+       int set_state (const XMLNode&, int version);
 
-       void send_route_feedback (std::list<Route*>&);
-       
   private:
-       void route_feedback (ARDOUR::Route&, bool);
        MIDI::Port* _port;
+       ARDOUR::microseconds_t _feedback_interval;
+       ARDOUR::microseconds_t last_feedback_time;
 
-       void port_change ();
-};
+       bool  do_feedback;
+       bool  auto_binding;
+       void _send_feedback ();
+       void  send_feedback ();
 
-}
+       typedef std::set<MIDIControllable*> MIDIControllables;
+       MIDIControllables controllables;
+
+       typedef std::list<std::pair<MIDIControllable*,sigc::connection> > MIDIPendingControllables;
+       MIDIPendingControllables pending_controllables;
+       Glib::Mutex controllables_lock;
+       Glib::Mutex pending_lock;
+
+       bool start_learning (PBD::Controllable*);
+       void stop_learning (PBD::Controllable*);
+
+       void learning_stopped (MIDIControllable*);
+
+       void create_binding (PBD::Controllable*, int, int);
+       void delete_binding (PBD::Controllable*);
+
+       void auto_binding_on();
+       void auto_binding_off();
+
+};
 
-#endif // ardour_generic_midi_control_protocol_h
+#endif /* ardour_generic_midi_control_protocol_h */