ardour/livetrax
13
0
Fork 0
Code

Use XMLNode::get/set_property API in Mixer_UI class

Browse Source
This commit is contained in:
Tim Mayberry 2016-08-27 14:15:18 +10:00
parent 8d6df23ebc
commit d41d612276
2 changed files with 39 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gtk2_ardour/editor_mixer.cc
View File

@ -39,6 +39,7 @@
#include "editor.h" #include "editor.h"
#include "editor_route_groups.h" #include "editor_route_groups.h"
#include "editor_regions.h" #include "editor_regions.h"
#include "enums_convert.h"
#include "gui_thread.h" #include "gui_thread.h"
#include "midi_time_axis.h" #include "midi_time_axis.h"
#include "mixer_strip.h" #include "mixer_strip.h"
@ -271,7 +272,7 @@ void
Editor::maybe_add_mixer_strip_width (XMLNode& node) Editor::maybe_add_mixer_strip_width (XMLNode& node)
{ {
if (current_mixer_strip) { if (current_mixer_strip) {
node.add_property ("mixer-width", enum_2_string (editor_mixer_strip_width)); node.set_property ("mixer-width", editor_mixer_strip_width);
} }
} }

83
gtk2_ardour/mixer_ui.cc
View File

@ -280,32 +280,30 @@ Mixer_UI::Mixer_UI ()
XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings(); XMLNode const * settings = ARDOUR_UI::instance()->mixer_settings();
XMLProperty const * prop;
float fract; float fract;
{ {
LocaleGuard lg; LocaleGuard lg;
if (!settings || ((prop = settings->property ("mixer-rhs-pane1-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { if (!settings || !settings->get_property ("mixer-rhs-pane1-pos", fract) || fract > 1.0) {
rhs_pane1.set_divider (0, 0.6f); fract = 0.6f;
} else { }
rhs_pane1.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;
} }
if (!settings || ((prop = settings->property ("mixer-rhs-pane2-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
rhs_pane2.set_divider (0, 0.7f);
} else {
rhs_pane2.set_divider (0, fract); rhs_pane2.set_divider (0, fract);
if (!settings || !settings->get_property ("mixer-list-hpane-pos", fract) || fract > 1.0) {
fract = 0.2f;
} }
if (!settings || ((prop = settings->property ("mixer-list-hpane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) {
list_hpane.set_divider (0, 0.2f);
} else {
list_hpane.set_divider (0, fract); list_hpane.set_divider (0, fract);
if (!settings || !settings->get_property ("mixer-inner-pane-pos", fract) || fract > 1.0) {
fract = 0.8f;
} }
if (!settings || ((prop = settings->property ("mixer-inner-pane-pos")) == 0) || ((fract = atof (prop->value())) > 1.0)) { inner_pane.set_divider (0, fract);
inner_pane.set_divider (0, 0.8f);
} else {
inner_pane.set_divider (0, atof (prop->value()));
}
} }
rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down); rhs_pane1.set_drag_cursor (*PublicEditor::instance().cursors()->expand_up_down);
@ -2069,27 +2067,22 @@ private:
int int
Mixer_UI::set_state (const XMLNode& node, int version) Mixer_UI::set_state (const XMLNode& node, int version)
{ {
XMLProperty const * prop;
LocaleGuard lg; LocaleGuard lg;
bool yn;
Tabbable::set_state (node, version); Tabbable::set_state (node, version);
if ((prop = node.property ("narrow-strips"))) { if (node.get_property ("narrow-strips", yn)) {
if (string_is_affirmative (prop->value())) { if (yn) {
set_strip_width (Narrow); set_strip_width (Narrow);
} else { } else {
set_strip_width (Wide); set_strip_width (Wide);
} }
} }
if ((prop = node.property ("show-mixer"))) { node.get_property ("show-mixer", _visible);
if (string_is_affirmative (prop->value())) {
_visible = true;
}
}
if ((prop = node.property ("maximised"))) { if (node.get_property ("maximised", yn)) {
bool yn = string_is_affirmative (prop->value());
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer")); Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMaximalMixer"));
assert (act); assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@ -2099,8 +2092,7 @@ Mixer_UI::set_state (const XMLNode& node, int version)
} }
} }
if ((prop = node.property ("show-mixer-list"))) { if (node.get_property ("show-mixer-list", yn)) {
bool yn = string_is_affirmative (prop->value());
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList")); Glib::RefPtr<Action> act = ActionManager::get_action (X_("Common"), X_("ToggleMixerList"));
assert (act); assert (act);
Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act); Glib::RefPtr<ToggleAction> tact = Glib::RefPtr<ToggleAction>::cast_dynamic(act);
@ -2118,11 +2110,11 @@ Mixer_UI::set_state (const XMLNode& node, int version)
const XMLNodeList& kids = plugin_order->children("PluginInfo"); const XMLNodeList& kids = plugin_order->children("PluginInfo");
XMLNodeConstIterator i; XMLNodeConstIterator i;
for (i = kids.begin(); i != kids.end(); ++i) { for (i = kids.begin(); i != kids.end(); ++i) {
if ((prop = (*i)->property ("unique-id"))) { std::string unique_id;
std::string unique_id = prop->value(); if ((*i)->get_property ("unique-id", unique_id)) {
order.push_back (unique_id); order.push_back (unique_id);
if ((prop = (*i)->property ("expanded"))) { if ((*i)->get_property ("expanded", yn)) {
favorite_ui_state[unique_id] = string_is_affirmative (prop->value()); favorite_ui_state[unique_id] = yn;
} }
} }
} }
@ -2137,34 +2129,29 @@ XMLNode&
Mixer_UI::get_state () Mixer_UI::get_state ()
{ {
XMLNode* node = new XMLNode (X_("Mixer")); XMLNode* node = new XMLNode (X_("Mixer"));
char buf[128];
LocaleGuard lg; LocaleGuard lg;
node->add_child_nocopy (Tabbable::get_state()); node->add_child_nocopy (Tabbable::get_state());
snprintf(buf,sizeof(buf), "%f", rhs_pane1.get_divider()); node->set_property (X_("mixer-rhs-pane1-pos"), rhs_pane1.get_divider());
node->add_property(X_("mixer-rhs-pane1-pos"), string(buf)); node->set_property (X_("mixer-rhs_pane2-pos"), rhs_pane2.get_divider());
snprintf(buf,sizeof(buf), "%f", rhs_pane2.get_divider()); node->set_property (X_("mixer-list-hpane-pos"), list_hpane.get_divider());
node->add_property(X_("mixer-rhs_pane2-pos"), string(buf)); node->set_property (X_("mixer-inner-pane-pos"), inner_pane.get_divider());
snprintf(buf,sizeof(buf), "%f", list_hpane.get_divider());
node->add_property(X_("mixer-list-hpane-pos"), string(buf));
snprintf(buf,sizeof(buf), "%f", inner_pane.get_divider());
node->add_property(X_("mixer-inner-pane-pos"), string(buf));
node->add_property ("narrow-strips", _strip_width == Narrow ? "yes" : "no"); node->set_property ("narrow-strips", (_strip_width == Narrow));
node->add_property ("show-mixer", _visible ? "yes" : "no"); node->set_property ("show-mixer", _visible);
node->add_property ("show-mixer-list", _show_mixer_list ? "yes" : "no"); node->set_property ("show-mixer-list", _show_mixer_list);
node->add_property ("maximised", _maximised ? "yes" : "no"); node->set_property ("maximised", _maximised);
store_current_favorite_order (); store_current_favorite_order ();
XMLNode* plugin_order = new XMLNode ("PluginOrder"); XMLNode* plugin_order = new XMLNode ("PluginOrder");
int cnt = 0; uint32_t cnt = 0;
for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i, ++cnt) { for (PluginInfoList::const_iterator i = favorite_order.begin(); i != favorite_order.end(); ++i, ++cnt) {
XMLNode* p = new XMLNode ("PluginInfo"); XMLNode* p = new XMLNode ("PluginInfo");
p->add_property ("sort", cnt); p->set_property ("sort", cnt);
p->add_property ("unique-id", (*i)->unique_id); p->set_property ("unique-id", (*i)->unique_id);
if (favorite_ui_state.find ((*i)->unique_id) != favorite_ui_state.end ()) { if (favorite_ui_state.find ((*i)->unique_id) != favorite_ui_state.end ()) {
p->add_property ("expanded", favorite_ui_state[(*i)->unique_id]); p->set_property ("expanded", favorite_ui_state[(*i)->unique_id]);
} }
plugin_order->add_child_nocopy (*p); plugin_order->add_child_nocopy (*p);
} }