diff options
author | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
---|---|---|
committer | Doug McLain <doug@nostar.net> | 2007-06-15 22:08:27 +0000 |
commit | 789cbb21810802adc478de3134fa42950c5e8569 (patch) | |
tree | 565760bb936fea79f18697f72126111169bebae1 /libs/ardour/ardour/configuration.h | |
parent | cd9fdb935f08966cc8c7170a39870e8adcae69d8 (diff) |
Major Theme Manager changes, see ardour-dev
git-svn-id: svn://localhost/ardour2/trunk@1987 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/ardour/configuration.h')
-rw-r--r-- | libs/ardour/ardour/configuration.h | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/libs/ardour/ardour/configuration.h b/libs/ardour/ardour/configuration.h index 31cb74ab33..ecc5494690 100644 --- a/libs/ardour/ardour/configuration.h +++ b/libs/ardour/ardour/configuration.h @@ -54,6 +54,8 @@ class Configuration : public Stateful std::map<std::string,MidiPortDescriptor *> midi_ports; + std::vector<ConfigVariable<uint32_t> *> canvas_colors; + void map_parameters (sigc::slot<void,const char*> theSlot); int load_state (); @@ -61,8 +63,9 @@ class Configuration : public Stateful int set_state (const XMLNode&); XMLNode& get_state (void); - XMLNode& get_variables (sigc::slot<bool,ConfigVariableBase::Owner>); + XMLNode& get_variables (sigc::slot<bool,ConfigVariableBase::Owner>, std::string which_node = "Config"); void set_variables (const XMLNode&, ConfigVariableBase::Owner owner); + void pack_canvasvars (); void set_current_owner (ConfigVariableBase::Owner); @@ -83,7 +86,12 @@ class Configuration : public Stateful #include "ardour/configuration_vars.h" #undef CONFIG_VARIABLE #undef CONFIG_VARIABLE_SPECIAL - + +#undef CANVAS_VARIABLE +#define CANVAS_VARIABLE(var,name,value) ConfigVariable<uint32_t> var; // <-- is this really so bad? +#include "ardour/canvas_vars.h" +#undef CANVAS_VARIABLE + private: /* declare variables */ |