Revert completely mystifying stupidity in a previous patch of mine, and (properly...

[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 73d9b215795f5efa40b969fe96c0c21e85e8ef74..d2b1796b1807bda11453ab8c30898dad205580a9 100644 (file)
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2000-2007 Paul Davis 
+    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
@@ -27,7 +27,7 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/stateful.h> 
+#include "pbd/stateful.h"
 
 namespace ARDOUR {
 
@@ -49,16 +49,15 @@ struct ControlProtocolInfo {
     ~ControlProtocolInfo() { if (state) { delete state; } }
 };
 
- class ControlProtocolManager : public sigc::trackable, public Stateful
+ class ControlProtocolManager : public sigc::trackable, public PBD::Stateful
 {
   public:
-       ControlProtocolManager ();
        ~ControlProtocolManager ();
 
-       static ControlProtocolManager& instance() { return *_instance; }
+       static ControlProtocolManager& instance();
 
        void set_session (Session&);
-       void discover_control_protocols (std::string search_path);
+       void discover_control_protocols ();
        void foreach_known_protocol (sigc::slot<void,const ControlProtocolInfo*>);
        void load_mandatory_protocols ();
 
@@ -71,10 +70,11 @@ struct ControlProtocolInfo {
 
        void set_protocol_states (const XMLNode&);
 
-       int set_state (const XMLNode&);
+       int set_state (const XMLNode&, int version);
        XMLNode& get_state (void);
 
   private:
+       ControlProtocolManager ();
        static ControlProtocolManager* _instance;
 
        Session* _session;