diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-22 18:53:19 -0500 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-12-22 19:48:30 -0500 |
| commit | d854c5d93c71d3d607dd22970f1a06f078f350ea (patch) | |
| tree | d46315ae0cee03c6cfcbc9713af0bea34bfd6652 /libs/ardour/ardour/rc_configuration.h | |
| parent | 1f0fbea6285b5390c23c44233d55d15a4cbe9cd8 (diff) | |
move ARDOUR::Configuration and ARDOUR::ConfigVariable into libpbd
Diffstat (limited to 'libs/ardour/ardour/rc_configuration.h')
| -rw-r--r-- | libs/ardour/ardour/rc_configuration.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/libs/ardour/ardour/rc_configuration.h b/libs/ardour/ardour/rc_configuration.h index d85c723ff8..413f1699d3 100644 --- a/libs/ardour/ardour/rc_configuration.h +++ b/libs/ardour/ardour/rc_configuration.h @@ -23,16 +23,17 @@ #include <map> #include <string> +#include "pbd/configuration.h" + #include "ardour/libardour_visibility.h" #include "ardour/types.h" #include "ardour/utils.h" -#include "ardour/configuration.h" class XMLNode; namespace ARDOUR { -class LIBARDOUR_API RCConfiguration : public Configuration +class LIBARDOUR_API RCConfiguration : public PBD::Configuration { public: RCConfiguration(); @@ -74,8 +75,8 @@ 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 |