diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-27 17:41:43 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-11-27 17:41:43 +0000 |
| commit | f3a833e38e669d3194652ddba40fa10377ff750a (patch) | |
| tree | aad359972ea39a46b2123884e1d2af70ebee6920 /libs/ardour/route.cc | |
| parent | 2bd721d1ccb35a095d7e2b35f069abc14b79ed30 (diff) | |
changes associated with save/restore of AutomationControl id's
git-svn-id: svn://localhost/ardour2/branches/3.0@8109 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/route.cc')
| -rw-r--r-- | libs/ardour/route.cc | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/libs/ardour/route.cc b/libs/ardour/route.cc index 97b1402d30..1e0edc2077 100644 --- a/libs/ardour/route.cc +++ b/libs/ardour/route.cc @@ -1832,6 +1832,7 @@ Route::state(bool full_state) node->add_child_nocopy (_input->state (full_state)); node->add_child_nocopy (_output->state (full_state)); node->add_child_nocopy (_solo_control->get_state ()); + node->add_child_nocopy (_mute_control->get_state ()); node->add_child_nocopy (_mute_master->get_state ()); XMLNode* remote_control_node = new XMLNode (X_("RemoteControl")); @@ -2013,11 +2014,9 @@ Route::_set_state (const XMLNode& node, int version, bool /*call_base*/) _extra_xml = new XMLNode (*child); - } else if (child->name() == X_("Controllable") && (prop = child->property("name")) != 0) { - + } else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) { if (prop->value() == "solo") { _solo_control->set_state (*child, version); - _session.add_controllable (_solo_control); } } else if (child->name() == X_("RemoteControl")) { @@ -2264,13 +2263,13 @@ Route::_set_state_2X (const XMLNode& node, int version) _extra_xml = new XMLNode (*child); - } else if (child->name() == X_("Controllable") && (prop = child->property("name")) != 0) { - - if (prop->value() == "solo") { + } else if (child->name() == Controllable::xml_node_name && (prop = child->property("name")) != 0) { + if (prop->value() == X_("solo")) { _solo_control->set_state (*child, version); - _session.add_controllable (_solo_control); - } - + } else if (prop->value() == X_("mute")) { + _mute_control->set_state (*child, version); + } + } else if (child->name() == X_("RemoteControl")) { if ((prop = child->property (X_("id"))) != 0) { int32_t x; |