diff options
| -rw-r--r-- | gtk2_ardour/ui_config.cc | 9 | ||||
| -rw-r--r-- | gtk2_ardour/ui_config.h | 1 |
2 files changed, 9 insertions, 1 deletions
diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc index 027d119c30..629b20dcdd 100644 --- a/gtk2_ardour/ui_config.cc +++ b/gtk2_ardour/ui_config.cc @@ -510,11 +510,12 @@ UIConfiguration::load_modifiers (XMLNode const & node) XMLProperty const *mod; modifiers.clear (); - + for (niter = nlist.begin(); niter != nlist.end(); ++niter) { if ((*niter)->name() != X_("Modifier")) { continue; } + name = (*niter)->property (X_("name")); mod = (*niter)->property (X_("modifier")); @@ -548,6 +549,12 @@ UIConfiguration::modifier (string const & name) const } ArdourCanvas::Color +UIConfiguration::color_mod (std::string const & colorname, std::string const & modifiername) const +{ + return HSV (color (colorname)).mod (modifier (modifiername)).color (); +} + +ArdourCanvas::Color UIConfiguration::color (const std::string& name, bool* failed) const { ColorAliases::const_iterator e = color_aliases.find (name); diff --git a/gtk2_ardour/ui_config.h b/gtk2_ardour/ui_config.h index d6f917da02..b30c76fa11 100644 --- a/gtk2_ardour/ui_config.h +++ b/gtk2_ardour/ui_config.h @@ -69,6 +69,7 @@ class UIConfiguration : public PBD::Stateful ArdourCanvas::Color quantized (ArdourCanvas::Color) const; ArdourCanvas::Color color (const std::string&, bool* failed = 0) const; + ArdourCanvas::Color color_mod (std::string const & color, std::string const & modifier) const; ArdourCanvas::HSV color_hsv (const std::string&) const; ArdourCanvas::SVAModifier modifier (const std::string&) const; |