Fix ExportFormatSpecification copy-c'tor

[ardour.git] / gtk2_ardour / ui_config.cc

diff --git a/gtk2_ardour/ui_config.cc b/gtk2_ardour/ui_config.cc
index 3af884abba83f63f3e42c41a10cffbc09f26813b..b6531e91d64afaa8f2add05e5a239c1b6afb8f01 100644 (file)
--- a/gtk2_ardour/ui_config.cc
+++ b/gtk2_ardour/ui_config.cc
@@ -41,7 +41,6 @@
 #include "pbd/failed_constructor.h"
 #include "pbd/file_utils.h"
 #include "pbd/gstdio_compat.h"
-#include "pbd/locale_guard.h"
 #include "pbd/unwind.h"
 #include "pbd/xml++.h"
 
@@ -61,7 +60,7 @@
 using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
-using namespace ArdourCanvas;
+using namespace Gtkmm2ext;
 
 static const char* ui_config_file_name = "ui_config";
 static const char* default_ui_config_file_name = "default_ui_config";
@@ -73,6 +72,7 @@ UIConfiguration&
 UIConfiguration::instance ()
 {
        static UIConfiguration s_instance;
+       _instance = &s_instance;
        return s_instance;
 }
 
@@ -137,14 +137,13 @@ UIConfiguration::parameter_changed (string param)
 void
 UIConfiguration::reset_gtk_theme ()
 {
-       LocaleGuard lg;
        std::string color_scheme_string("gtk_color_scheme = \"");
 
        for (ColorAliases::iterator g = color_aliases.begin(); g != color_aliases.end(); ++g) {
 
                if (g->first.find ("gtk_") == 0) {
                        const string gtk_name = g->first.substr (4);
-                       ArdourCanvas::Color a_color = color (g->second);
+                       Gtkmm2ext::Color a_color = color (g->second);
 
                        color_scheme_string += gtk_name + ":#" + color_to_hex_string_no_alpha (a_color) + ';';
                }
@@ -220,7 +219,7 @@ UIConfiguration::post_gui_init ()
 int
 UIConfiguration::load_defaults ()
 {
-        std::string rcfile;
+       std::string rcfile;
        int ret = -1;
 
        if (find_file (ardour_config_search_path(), default_ui_config_file_name, rcfile) ) {
@@ -362,7 +361,6 @@ int
 UIConfiguration::store_color_theme ()
 {
        XMLNode* root;
-       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
@@ -409,7 +407,6 @@ UIConfiguration::store_color_theme ()
 int
 UIConfiguration::load_state ()
 {
-       LocaleGuard lg; // a single guard for all 3 configs
        bool found = false;
 
        std::string rcfile;
@@ -499,7 +496,6 @@ XMLNode&
 UIConfiguration::get_state ()
 {
        XMLNode* root;
-       LocaleGuard lg;
 
        root = new XMLNode("Ardour");
 
@@ -517,7 +513,6 @@ XMLNode&
 UIConfiguration::get_variables (std::string which_node)
 {
        XMLNode* node;
-       LocaleGuard lg;
 
        node = new XMLNode (which_node);
 
@@ -536,7 +531,6 @@ UIConfiguration::get_variables (std::string which_node)
 int
 UIConfiguration::set_state (const XMLNode& root, int /*version*/)
 {
-       LocaleGuard lg;
        /* this can load a generic UI configuration file or a colors file */
 
        if (root.name() != "Ardour") {
@@ -623,7 +617,7 @@ UIConfiguration::load_colors (XMLNode const & node)
                color = child->property (X_("value"));
 
                if (name && color) {
-                       ArdourCanvas::Color c;
+                       Gtkmm2ext::Color c;
                        c = strtoul (color->value().c_str(), 0, 16);
                        /* insert or replace color name definition */
                        colors[name->value()] =  c;
@@ -634,7 +628,6 @@ UIConfiguration::load_colors (XMLNode const & node)
 void
 UIConfiguration::load_modifiers (XMLNode const & node)
 {
-       PBD::LocaleGuard lg;
        XMLNodeList const nlist = node.children();
        XMLNodeConstIterator niter;
        XMLProperty const *name;
@@ -668,7 +661,7 @@ UIConfiguration::set_variables (const XMLNode& node)
 #undef  CANVAS_FONT_VARIABLE
 }
 
-ArdourCanvas::SVAModifier
+Gtkmm2ext::SVAModifier
 UIConfiguration::modifier (string const & name) const
 {
        Modifiers::const_iterator m = modifiers.find (name);
@@ -678,19 +671,19 @@ UIConfiguration::modifier (string const & name) const
        return SVAModifier ();
 }
 
-ArdourCanvas::Color
+Gtkmm2ext::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_mod (const ArdourCanvas::Color& color, std::string const & modifiername) const
+Gtkmm2ext::Color
+UIConfiguration::color_mod (const Gtkmm2ext::Color& color, std::string const & modifiername) const
 {
        return HSV (color).mod (modifier (modifiername)).color ();
 }
 
-ArdourCanvas::Color
+Gtkmm2ext::Color
 UIConfiguration::color (const std::string& name, bool* failed) const
 {
        ColorAliases::const_iterator e = color_aliases.find (name);
@@ -738,7 +731,7 @@ UIConfiguration::quantized (Color c) const
 }
 
 void
-UIConfiguration::set_color (string const& name, ArdourCanvas::Color color)
+UIConfiguration::set_color (string const& name, Gtkmm2ext::Color color)
 {
        Colors::iterator i = colors.find (name);
        if (i == colors.end()) {
@@ -792,13 +785,13 @@ UIConfiguration::load_rc_file (bool themechange, bool allow_own)
                return;
        }
 
-       info << "Loading ui configuration file " << rc_file_path << endmsg;
+       info << string_compose (_("Loading ui configuration file %1"), rc_file_path) << endmsg;
 
        Gtkmm2ext::UI::instance()->load_rcfile (rc_file_path, themechange);
 }
 
 std::string
-UIConfiguration::color_to_hex_string (ArdourCanvas::Color c)
+UIConfiguration::color_to_hex_string (Gtkmm2ext::Color c)
 {
        char buf[16];
        int retval = g_snprintf (buf, sizeof(buf), "%08x", c);
@@ -810,7 +803,7 @@ UIConfiguration::color_to_hex_string (ArdourCanvas::Color c)
 }
 
 std::string
-UIConfiguration::color_to_hex_string_no_alpha (ArdourCanvas::Color c)
+UIConfiguration::color_to_hex_string_no_alpha (Gtkmm2ext::Color c)
 {
        c >>= 8; // shift/remove alpha
        char buf[16];