ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

remove CANVAS_STRING_VARIABLE (it was replaced by CANVAS_FONT_VARIABLE

Browse Source
This commit is contained in:
Paul Davis 2014-12-05 09:25:34 -05:00
parent 2449fc9681
commit dd49a249ad
2 changed files with 0 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
gtk2_ardour/ui_config.cc
View File

@ -320,18 +320,14 @@ UIConfiguration::get_variables (std::string which_node)
#undef UI_CONFIG_VARIABLE
#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
#undef CANVAS_BASE_COLOR
#define UI_CONFIG_VARIABLE(Type,var,Name,value) if (node->name() == "UI") { var.add_to_node (*node); }
#define CANVAS_STRING_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); }
#define CANVAS_FONT_VARIABLE(var,Name) if (node->name() == "Canvas") { var.add_to_node (*node); }
#define CANVAS_BASE_COLOR(var,Name,val) if (node->name() == "Canvas") { var.add_to_node (*node); }
#include "ui_config_vars.h"
#include "canvas_vars.h"
#include "base_colors.h"
#undef UI_CONFIG_VARIABLE
#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
#undef CANVAS_BASE_COLOR
return *node;
}

7
gtk2_ardour/ui_config.h
View File

@ -140,15 +140,10 @@ class UIConfiguration : public PBD::Stateful
bool set_##var (Type val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "ui_config_vars.h"
#undef UI_CONFIG_VARIABLE
#undef CANVAS_STRING_VARIABLE
#define CANVAS_STRING_VARIABLE(var,name) \
std::string get_##var () const { return var.get(); } \
bool set_##var (const std::string& val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#define CANVAS_FONT_VARIABLE(var,name) \
Pango::FontDescription get_##var () const { return ARDOUR_UI_UTILS::sanitized_font (var.get()); } \
bool set_##var (const std::string& val) { bool ret = var.set (val); if (ret) { ParameterChanged (name); } return ret; }
#include "canvas_vars.h"
#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
#undef CANVAS_BASE_COLOR
@ -172,10 +167,8 @@ class UIConfiguration : public PBD::Stateful
#include "ui_config_vars.h"
#undef UI_CONFIG_VARIABLE
#define CANVAS_STRING_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
#define CANVAS_FONT_VARIABLE(var,name) ARDOUR::ConfigVariable<std::string> var;
#include "canvas_vars.h"
#undef CANVAS_STRING_VARIABLE
#undef CANVAS_FONT_VARIABLE
/* declare base color variables (these are modifiable by the user) */