new transport slave/master implementation, libs/ edition

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

diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h
index d85c723ff8f3a60d4ca5abfe8b03c37a6f4062b9..f3b98c777433681031fc33387d4a6daa1ec6871d 100644 (file)
--- a/libs/ardour/ardour/rc_configuration.h
+++ b/libs/ardour/ardour/rc_configuration.h
@@ -26,13 +26,15 @@
 #include "ardour/libardour_visibility.h"
 #include "ardour/types.h"
 #include "ardour/utils.h"
-#include "ardour/configuration.h"
+#include "ardour/types_convert.h"
+
+#include "pbd/configuration.h"
 
 class XMLNode;
 
 namespace ARDOUR {
 
-class LIBARDOUR_API RCConfiguration : public Configuration
+class LIBARDOUR_API RCConfiguration : public PBD::Configuration
 {
   public:
        RCConfiguration();
@@ -53,6 +55,7 @@ class LIBARDOUR_API RCConfiguration : public Configuration
        XMLNode * instant_xml (const std::string& str);
 
        XMLNode* control_protocol_state () { return _control_protocol_state; }
+       XMLNode* transport_master_state () { return _transport_master_state; }
 
        /* define accessor methods */
 
@@ -74,13 +77,14 @@ class LIBARDOUR_API RCConfiguration : public Configuration
 
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
-#define CONFIG_VARIABLE(Type,var,name,value) ConfigVariable<Type> var;
-#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) ConfigVariableWithMutation<Type> var;
+#define CONFIG_VARIABLE(Type,var,name,value) PBD::ConfigVariable<Type> var;
+#define CONFIG_VARIABLE_SPECIAL(Type,var,name,value,mutator) PBD::ConfigVariableWithMutation<Type> var;
 #include "ardour/rc_configuration_vars.h"
 #undef  CONFIG_VARIABLE
 #undef  CONFIG_VARIABLE_SPECIAL
 
        XMLNode* _control_protocol_state;
+       XMLNode* _transport_master_state;
 };
 
 /* XXX: rename this */