X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcontrol_protocol_manager.h;h=c6ea045ce10d090a6218ac549668552cc06fc4ed;hb=7c2302651559eda71833c291ddc17f4d590ad95a;hp=d2b1796b1807bda11453ab8c30898dad205580a9;hpb=8713667ec1a6cc9ba56c07f763e5a422cc47fbef;p=ardour.git

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index d2b1796b18..c6ea045ce1 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -23,11 +23,11 @@
 #include <string>
 #include <list>
 
-#include <sigc++/sigc++.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
 #include "pbd/stateful.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
@@ -35,57 +35,65 @@ class ControlProtocol;
 class ControlProtocolDescriptor;
 class Session;
 
-struct ControlProtocolInfo {
-    ControlProtocolDescriptor* descriptor;
-    ControlProtocol* protocol;
-    std::string name;
-    std::string path;
-    bool requested;
-    bool mandatory;
-    bool supports_feedback;
-    XMLNode* state;
-
-    ControlProtocolInfo() : descriptor (0), protocol (0), state (0) {}
-    ~ControlProtocolInfo() { if (state) { delete state; } }
+class LIBARDOUR_API ControlProtocolInfo {
+	public:
+		ControlProtocolDescriptor* descriptor;
+		ControlProtocol* protocol;
+		std::string name;
+		std::string path;
+		bool requested;
+		bool mandatory;
+		bool supports_feedback;
+		XMLNode* state;
+
+		ControlProtocolInfo() : descriptor (0), protocol (0), requested(false),
+		mandatory(false), supports_feedback(false), state (0)
+	{}
+		~ControlProtocolInfo();
+
 };
 
- class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
+class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
 {
   public:
 	~ControlProtocolManager ();
 
 	static ControlProtocolManager& instance();
 
-	void set_session (Session&);
+	void set_session (Session*);
 	void discover_control_protocols ();
-	void foreach_known_protocol (sigc::slot<void,const ControlProtocolInfo*>);
+	void foreach_known_protocol (boost::function<void(const ControlProtocolInfo*)>);
 	void load_mandatory_protocols ();
+	void midi_connectivity_established ();
+	void drop_protocols ();
+	void register_request_buffer_factories ();
 
-	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;
 
-	Session* _session;
-	Glib::Mutex protocols_lock;
+	Glib::Threads::Mutex protocols_lock;
 	std::list<ControlProtocol*>    control_protocols;
 
-	void drop_session ();
+	void session_going_away ();
 
 	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