From 85732a66e34bf1ee21463a662b54eab545c394e1 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Mon, 5 Sep 2016 09:06:17 +1000 Subject: Remove LocaleGuard from MixerUI class The float <=> string conversions that this guard was protecting are now using PBD::to_string/string_to() via XMLNode::get/set_property() --- gtk2_ardour/mixer_ui.cc | 37 +++++++++++++++---------------------- 1 file changed, 15 insertions(+), 22 deletions(-) (limited to 'gtk2_ardour/mixer_ui.cc') diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index 7d2d0885c8..a9083de370 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -280,33 +280,28 @@ Mixer_UI::Mixer_UI () list_hpane.add (global_hpacker); list_hpane.set_child_minsize (list_vpacker, 1); - XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings(); float fract; - { - LocaleGuard lg; - - if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) { - fract = 0.6f; - } - rhs_pane1.set_divider (0, fract); + if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) { + fract = 0.6f; + } + rhs_pane1.set_divider (0, fract); - if (!settings || !settings->get_property ("mixer-rhs-pane2-pos", fract) || fract > 1.0) { - fract = 0.7f; - } - rhs_pane2.set_divider (0, fract); + if (!settings || !settings->get_property ("mixer-rhs-pane2-pos", fract) || fract > 1.0) { + fract = 0.7f; + } + rhs_pane2.set_divider (0, fract); - if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) { - fract = 0.2f; - } - list_hpane.set_divider (0, fract); + if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) { + fract = 0.2f; + } + list_hpane.set_divider (0, fract); - if (!settings || !settings->get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) { - fract = 0.8f; - } - inner_pane.set_divider (0, fract); + if (!settings || !settings->get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) { + fract = 0.8f; } + inner_pane.set_divider (0, fract); rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); rhs_pane2.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); @@ -2060,7 +2055,6 @@ private: int Mixer_UI::set_state (const XMLNode& node, int version) { - LocaleGuard lg; bool yn; Tabbable::set_state (node, version); @@ -2130,7 +2124,6 @@ XMLNode& Mixer_UI::get_state () { XMLNode* node = new XMLNode (X_("Mixer")); - LocaleGuard lg; node->add_child_nocopy (Tabbable::get_state()); -- cgit v1.2.3