summaryrefslogtreecommitdiff
path: root/gtk2_ardour/mixer_ui.cc
diff options
context:
space:
mode:
authorTim Mayberry <mojofunk@gmail.com>2016-09-05 09:06:17 +1000
committerTim Mayberry <mojofunk@gmail.com>2017-06-22 10:48:38 +1000
commit85732a66e34bf1ee21463a662b54eab545c394e1 (patch)
treec0913e06f5ec158dea70106571941fd05da11f92 /gtk2_ardour/mixer_ui.cc
parent4e385b44a61c394bad5cd9a334011cd70e59a4a0 (diff)
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()
Diffstat (limited to 'gtk2_ardour/mixer_ui.cc')
-rw-r--r--gtk2_ardour/mixer_ui.cc37
1 files changed, 15 insertions, 22 deletions
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());