ardour/livetrax
13
0
Fork 0
Code

fix restore of Pannable state from XML (regression in alpha6)

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@9717 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-06-12 22:17:29 +00:00
parent dabe57a486
commit 5afe60f0e3
1 changed files with 19 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
libs/ardour/pannable.cc
View File

@ -209,16 +209,25 @@ Pannable::set_state (const XMLNode& root, int version)
XMLNodeConstIterator niter;
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->name() == pan_azimuth_control->name()) {
pan_azimuth_control->set_state (**niter, version);
} else if ((*niter)->name() == pan_width_control->name()) {
pan_width_control->set_state (**niter, version);
} else if ((*niter)->name() == pan_elevation_control->name()) {
pan_elevation_control->set_state (**niter, version);
} else if ((*niter)->name() == pan_frontback_control->name()) {
pan_frontback_control->set_state (**niter, version);
} else if ((*niter)->name() == pan_lfe_control->name()) {
pan_lfe_control->set_state (**niter, version);
if ((*niter)->name() == Controllable::xml_node_name) {
const XMLProperty* prop = (*niter)->property (X_("name"));
if (!prop) {
continue;
}
if (prop->value() == pan_azimuth_control->name()) {
pan_azimuth_control->set_state (**niter, version);
} else if (prop->value() == pan_width_control->name()) {
pan_width_control->set_state (**niter, version);
} else if (prop->value() == pan_elevation_control->name()) {
pan_elevation_control->set_state (**niter, version);
} else if (prop->value() == pan_frontback_control->name()) {
pan_frontback_control->set_state (**niter, version);
} else if (prop->value() == pan_lfe_control->name()) {
pan_lfe_control->set_state (**niter, version);
}
} else if ((*niter)->name() == Automatable::xml_node_name) {
set_automation_xml_state (**niter, PanAzimuthAutomation);
}