merge from trunk

[ardour.git] / libs / ardour / ardour / configuration.h

diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h
index d067bc6e61b6229ae19c9c08f9c3cefe20bf33e8..dd689e9a2d350dae6823a419c313a7977aadd17f 100644 (file)
--- a/libs/ardour/ardour/configuration.h
+++ b/libs/ardour/ardour/configuration.h
@@ -27,8 +27,9 @@
 #include <sys/types.h>
 #include <string>
 
+#include <pbd/stateful.h> 
+
 #include <ardour/types.h>
-#include <ardour/stateful.h>
 #include <ardour/utils.h>
 #include <ardour/configuration_variable.h>
 
@@ -60,6 +61,8 @@ class Configuration : public Stateful
        int set_state (const XMLNode&);
        XMLNode& get_state (void);
 
+       XMLNode* control_protocol_state () { return _control_protocol_state; }
+
         /* define accessor methods */
 
 #undef  CONFIG_VARIABLE
@@ -88,6 +91,7 @@ class Configuration : public Stateful
 #undef  CONFIG_VARIABLE_SPECIAL        
 
        bool     user_configuration;
+       XMLNode* _control_protocol_state;
 
        XMLNode& state (bool user_only);
 };
@@ -95,6 +99,6 @@ class Configuration : public Stateful
 extern Configuration *Config;
 extern gain_t speed_quietning; /* see comment in configuration.cc */
 
-}; /* namespace ARDOUR */
+} // namespace ARDOUR
 
 #endif /* __ardour_configuration_h__ */