A few type 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 73d9b215795f5efa40b969fe96c0c21e85e8ef74..ad5bb3166eb339d7fd1cf9b61d0221ed0396dc7c 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
@@ -23,11 +23,11 @@
 #include <string>
 #include <list>
 
-#include <sigc++/sigc++.h>
 
 #include <glibmm/thread.h>
 
-#include <pbd/stateful.h> 
+#include "pbd/stateful.h"
+#include "ardour/session_handle.h"
 
 namespace ARDOUR {
 
@@ -45,21 +45,22 @@ 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 sigc::trackable, public Stateful
+class 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 ();
 
        ControlProtocol* instantiate (ControlProtocolInfo&);
@@ -71,17 +72,17 @@ 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;
        Glib::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);