Strip trailing whitespace and fix other whitespace errors (e.g. space/tab mixing...

[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 8eda7a4555b83a648faa3b1aa3f68f3f40dada50..bceece9adf47d8a99089ac30f958de9ae49f143a 100644 (file)
--- a/libs/ardour/ardour/control_protocol_manager.h
+++ b/libs/ardour/ardour/control_protocol_manager.h
@@ -1,3 +1,22 @@
+/*
+    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
 
@@ -8,7 +27,7 @@
 
 #include <glibmm/thread.h>
 
-#include <pbd/stateful.h> 
+#include "pbd/stateful.h"
 
 namespace ARDOUR {
 
@@ -23,19 +42,22 @@ struct ControlProtocolInfo {
     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 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 ();
 
@@ -46,10 +68,13 @@ struct ControlProtocolInfo {
 
        static const std::string state_node_name;
 
+       void set_protocol_states (const XMLNode&);
+
        int set_state (const XMLNode&);
        XMLNode& get_state (void);
 
   private:
+       ControlProtocolManager ();
        static ControlProtocolManager* _instance;
 
        Session* _session;