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

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 03b21a299c..c6ea045ce1 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -1,14 +1,33 @@
+/*
+    Copyright (C) 2000-2007 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
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program; if not, write to the Free Software
+    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+
+*/
+
 #ifndef ardour_control_protocol_manager_h
 #define ardour_control_protocol_manager_h
 
 #include <string>
 #include <list>
 
-#include <sigc++/sigc++.h>
 
-#include <glibmm/thread.h>
+#include <glibmm/threads.h>
 
-#include <ardour/stateful.h>
+#include "pbd/stateful.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
@@ -16,50 +35,65 @@ class ControlProtocol;
 class ControlProtocolDescriptor;
 class Session;
 
-struct ControlProtocolInfo {
-    ControlProtocolDescriptor* descriptor;
-    ControlProtocol* protocol;
-    std::string name;
-    std::string path;
-    bool requested;
-    bool mandatory;
+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 Stateful
+class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
 {
   public:
-	ControlProtocolManager ();
 	~ControlProtocolManager ();
 
-	static ControlProtocolManager& instance() { return *_instance; }
+	static ControlProtocolManager& instance();
 
-	void set_session (Session&);
-	void discover_control_protocols (std::string search_path);
-	void foreach_known_protocol (sigc::slot<void,const ControlProtocolInfo*>);
+	void set_session (Session*);
+	void discover_control_protocols ();
+	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;
 
-	int set_state (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