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()
This commit is contained in:
parent
4e385b44a6
commit
85732a66e3
@ -280,33 +280,28 @@ Mixer_UI::Mixer_UI ()
|
|||||||
list_hpane.add (global_hpacker);
|
list_hpane.add (global_hpacker);
|
||||||
list_hpane.set_child_minsize (list_vpacker, 1);
|
list_hpane.set_child_minsize (list_vpacker, 1);
|
||||||
|
|
||||||
|
|
||||||
XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
|
XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
|
||||||
float fract;
|
float fract;
|
||||||
|
|
||||||
{
|
if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) {
|
||||||
LocaleGuard lg;
|
fract = 0.6f;
|
||||||
|
|
||||||
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-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);
|
|
||||||
}
|
}
|
||||||
|
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-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);
|
||||||
|
|
||||||
rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
|
rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
|
||||||
rhs_pane2.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
|
int
|
||||||
Mixer_UI::set_state (const XMLNode& node, int version)
|
Mixer_UI::set_state (const XMLNode& node, int version)
|
||||||
{
|
{
|
||||||
LocaleGuard lg;
|
|
||||||
bool yn;
|
bool yn;
|
||||||
|
|
||||||
Tabbable::set_state (node, version);
|
Tabbable::set_state (node, version);
|
||||||
@ -2130,7 +2124,6 @@ XMLNode&
|
|||||||
Mixer_UI::get_state ()
|
Mixer_UI::get_state ()
|
||||||
{
|
{
|
||||||
XMLNode* node = new XMLNode (X_("Mixer"));
|
XMLNode* node = new XMLNode (X_("Mixer"));
|
||||||
LocaleGuard lg;
|
|
||||||
|
|
||||||
node->add_child_nocopy (Tabbable::get_state());
|
node->add_child_nocopy (Tabbable::get_state());
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user