diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-08 20:14:22 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2008-10-08 20:14:22 +0000 |
| commit | 89e4d352445e9394073804f78fbd6845e6820f20 (patch) | |
| tree | 14cf1f812444a3fa5271cc7c324e1d9a67c744e9 /libs/ardour/panner.cc | |
| parent | 1d210a54f9b1c0da7a196413bd760ff53f198270 (diff) | |
torben's port buffer reworking; torben's panner automation loading patch (allows loading of 2.X sessions)
git-svn-id: svn://localhost/ardour2/branches/3.0@3890 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
| -rw-r--r-- | libs/ardour/panner.cc | 15 |
1 files changed, 4 insertions, 11 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index c616a6fe00..6a6a840407 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -1000,6 +1000,7 @@ Panner::set_state (const XMLNode& node) XMLNodeConstIterator niter; const XMLProperty *prop; uint32_t i; + uint32_t num_panners = 0; StreamPanner* sp; LocaleGuard lg (X_("POSIX")); @@ -1022,15 +1023,6 @@ Panner::set_state (const XMLNode& node) set_bypassed (prop->value() == "yes"); } - if ((prop = node.property (X_("ins"))) != 0) { - ins.set_audio(atoi(prop->value().c_str())); - } - - if ((prop = node.property (X_("outs"))) != 0) { - outs.set_audio(atoi(prop->value().c_str())); - } - - if ((prop = node.property (X_("link_direction"))) != 0) { LinkDirection ld; /* here to provide type information */ set_link_direction (LinkDirection (string_2_enum (prop->value(), ld))); @@ -1068,7 +1060,8 @@ Panner::set_state (const XMLNode& node) assumption, but its still an assumption. */ - sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, i)); + sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, num_panners)); + num_panners++; if (sp->set_state (**niter) == 0) { _streampanners.push_back (sp); @@ -1094,7 +1087,7 @@ Panner::set_state (const XMLNode& node) } } - reset(ins.n_audio(), outs.n_audio()); + reset(num_panners, outputs.size()); /* don't try to do old-school automation loading if it wasn't marked as existing */ if ((prop = node.property (X_("automation")))) { |