diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-12 22:17:29 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-06-12 22:17:29 +0000 |
| commit | 5afe60f0e3e726dbf3bb13944d723a86a3cfde0d (patch) | |
| tree | c07685c0394300f48cc23c3e79cc057f73f54b50 /libs/ardour/pannable.cc | |
| parent | dabe57a486410493996f8bcddf91403ed855fe51 (diff) | |
fix restore of Pannable state from XML (regression in alpha6)
git-svn-id: svn://localhost/ardour2/branches/3.0@9717 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/pannable.cc')
| -rw-r--r-- | libs/ardour/pannable.cc | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/libs/ardour/pannable.cc b/libs/ardour/pannable.cc index e020c19451..6dbb5005c2 100644 --- a/libs/ardour/pannable.cc +++ b/libs/ardour/pannable.cc @@ -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); } |