merge with master, with minor conflict fixes

[ardour.git] / libs / ardour / ardour / control_protocol_manager.h

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 6fedc95c6c679bb309d69d8a79bc9c67a9d39d88..0c8c9014f0668122062ddd8f154dbf5c0b91fcab 100644 (file)
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -24,7 +24,7 @@
 #include <list>
 
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/stateful.h"
 #include "ardour/session_handle.h"
@@ -35,7 +35,8 @@ class ControlProtocol;
 class ControlProtocolDescriptor;
 class Session;
 
-struct ControlProtocolInfo {
+class LIBARDOUR_API ControlProtocolInfo {
+public:
     ControlProtocolDescriptor* descriptor;
     ControlProtocol* protocol;
     std::string name;
@@ -45,11 +46,13 @@ struct ControlProtocolInfo {
     bool supports_feedback;
     XMLNode* state;
 
-    ControlProtocolInfo() : descriptor (0), protocol (0), state (0) {}
-    ~ControlProtocolInfo() { if (state) { delete state; } }
+    ControlProtocolInfo() : descriptor (0), protocol (0), requested(false),
+               mandatory(false), supports_feedback(false), state (0)
+       {}
+    ~ControlProtocolInfo() { delete state; }
 };
 
-class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
+class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
 {
   public:
        ~ControlProtocolManager ();
@@ -60,24 +63,25 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl
        void discover_control_protocols ();
        void foreach_known_protocol (boost::function<void(const ControlProtocolInfo*)>);
        void load_mandatory_protocols ();
+       void midi_connectivity_established ();
 
-       ControlProtocol* instantiate (ControlProtocolInfo&);
-       int              teardown (ControlProtocolInfo&);
-
+        int activate (ControlProtocolInfo&);
+        int deactivate (ControlProtocolInfo&);
+       
        std::list<ControlProtocolInfo*> control_protocol_info;
 
        static const std::string state_node_name;
 
-       void set_protocol_states (const XMLNode&);
-
        int set_state (const XMLNode&, int version);
        XMLNode& get_state (void);
 
+        PBD::Signal1<void,ControlProtocolInfo*> ProtocolStatusChange;
+
   private:
        ControlProtocolManager ();
        static ControlProtocolManager* _instance;
 
-       Glib::Mutex protocols_lock;
+       Glib::Threads::Mutex protocols_lock;
        std::list<ControlProtocol*>    control_protocols;
 
        void session_going_away ();
@@ -85,6 +89,8 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl
        int control_protocol_discover (std::string path);
        ControlProtocolDescriptor* get_descriptor (std::string path);
        ControlProtocolInfo* cpi_by_name (std::string);
+       ControlProtocol* instantiate (ControlProtocolInfo&);
+       int teardown (ControlProtocolInfo&);
 };
 
 } // namespace