X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fardour%2Fcontrol_protocol_manager.h;h=0c8c9014f0668122062ddd8f154dbf5c0b91fcab;hb=8a128b33d38172ae525ac798c53bc105bc4e2c64;hp=94fd0df2b47cc6cf2dee8d4cea3c11a9a9ecf9da;hpb=cff8a65db2c1dc7c96e9591370d01f8da5b1f324;p=ardour.git

diff --git a/libs/ardour/ardour/control_protocol_manager.h b/libs/ardour/ardour/control_protocol_manager.h
index 94fd0df2b4..0c8c9014f0 100644
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -35,7 +35,7 @@ class ControlProtocol;
 class ControlProtocolDescriptor;
 class Session;
 
-class ControlProtocolInfo {
+class LIBARDOUR_API ControlProtocolInfo {
 public:
     ControlProtocolDescriptor* descriptor;
     ControlProtocol* protocol;
@@ -52,7 +52,7 @@ public:
     ~ControlProtocolInfo() { delete state; }
 };
 
-class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
+class LIBARDOUR_API ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandlePtr
 {
   public:
 	~ControlProtocolManager ();
@@ -65,8 +65,8 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl
 	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;
 
@@ -75,7 +75,7 @@ class ControlProtocolManager : public PBD::Stateful, public ARDOUR::SessionHandl
 	int set_state (const XMLNode&, int version);
 	XMLNode& get_state (void);
 
-        sigc::signal<void,ControlProtocolInfo*> ProtocolStatusChange;
+        PBD::Signal1<void,ControlProtocolInfo*> ProtocolStatusChange;
 
   private:
 	ControlProtocolManager ();
@@ -89,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