diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 10:54:12 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-06-13 12:22:39 -0400 |
| commit | a50569e7870bed622537aeb137501e82e3d57e61 (patch) | |
| tree | 7506019cb11c267d5429a04581369b445e9ddd54 /gtk2_ardour/ui_config.cc | |
| parent | f2404a522d3914948caa357da792d8f84cec8456 (diff) | |
rename UIConfigVariable as ColorVariable since that is really it should be used for; use ARDOUR::ConfigVariable for everything else in UI config
Diffstat (limited to 'gtk2_ardour/ui_config.cc')
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 215df25e7f..2e856e629e 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -45,13 +45,16 @@ UIConfiguration::UIConfiguration () #undef UI_CONFIG_VARIABLE #undef CANVAS_VARIABLE #define UI_CONFIG_VARIABLE(Type,var,name,val) var (name,val), -#define CANVAS_VARIABLE(var,name) var (name), +#define CANVAS_VARIABLE(var,val) var (val), +#define CANVAS_STRING_VARIABLE(var,val) var (val), #include "ui_config_vars.h" #include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_VARIABLE +#undef CANVAS_STRING_VARIABLE _dirty (false) { + std::cerr << "Ruler FOnt in constructor " << canvasvar_RulerFont.get() << "\n"; load_state(); } @@ -215,10 +218,12 @@ UIConfiguration::get_variables (std::string which_node) #undef CANVAS_VARIABLE #define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); } #define CANVAS_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } +#define CANVAS_STRING_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); } #include "ui_config_vars.h" #include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_VARIABLE +#undef CANVAS_STRING_VARIABLE return *node; } @@ -262,25 +267,32 @@ UIConfiguration::set_variables (const XMLNode& node) if (var.set_from_node (node)) { \ ParameterChanged (name); \ } +#define CANVAS_STRING_VARIABLE(var,name) \ + if (var.set_from_node (node)) { \ + ParameterChanged (name); \ + } #include "ui_config_vars.h" #include "canvas_vars.h" #undef UI_CONFIG_VARIABLE #undef CANVAS_VARIABLE +#undef CANVAS_STRING_VARIABLE } void UIConfiguration::pack_canvasvars () { #undef CANVAS_VARIABLE -#define CANVAS_VARIABLE(var,name) canvas_colors.insert (std::pair<std::string,UIConfigVariable<uint32_t>* >(name,&var)); +#define CANVAS_VARIABLE(var,name) canvas_colors.insert (std::pair<std::string,ColorVariable<uint32_t>* >(name,&var)); +#define CANVAS_STRING_VARIABLE(var,name) #include "canvas_vars.h" #undef CANVAS_VARIABLE +#undef CANVAS_STRING_VARIABLE } uint32_t UIConfiguration::color_by_name (const std::string& name) { - map<std::string,UIConfigVariable<uint32_t>* >::iterator i = canvas_colors.find (name); + map<std::string,ColorVariable<uint32_t>* >::iterator i = canvas_colors.find (name); if (i != canvas_colors.end()) { return i->second->get(); |