diff options
| author | David Robillard <d@drobilla.net> | 2007-07-03 02:37:24 +0000 |
|---|---|---|
| committer | David Robillard <d@drobilla.net> | 2007-07-03 02:37:24 +0000 |
| commit | 0da29770276604a7f0a367cd8eb5ff2fff7a2233 (patch) | |
| tree | 87f37c252457eab66c0806e097a2d147d8d66916 /libs/ardour/panner.cc | |
| parent | ef0b9a740996c432a6a96180814d4f8d0ee16842 (diff) | |
Pan automation/serialization fixes.
"Live" Midi CC sending from Midi CC automation track controllers.
git-svn-id: svn://localhost/ardour2/trunk@2097 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
| -rw-r--r-- | libs/ardour/panner.cc | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index a20342330f..3912faf9e7 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -73,6 +73,8 @@ StreamPanner::StreamPanner (Panner& p, ParamID param) : parent (p) , _control (new PanControllable(p.session(), X_("panner"), *this, param)) { + assert(param.type() != NullAutomation); + _muted = false; parent.session().add_controllable (_control); @@ -189,8 +191,8 @@ StreamPanner::add_state (XMLNode& node) /*---------------------------------------------------------------------- */ -BaseStereoPanner::BaseStereoPanner (Panner& p) - : StreamPanner (p, ParamID(PanAutomation, 0)) +BaseStereoPanner::BaseStereoPanner (Panner& p, ParamID param) + : StreamPanner (p, param) { } @@ -346,8 +348,8 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain /*---------------------------------------------------------------------- */ -EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p) - : BaseStereoPanner (p) +EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p, ParamID param) + : BaseStereoPanner (p, param) { update (); @@ -461,9 +463,9 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob } StreamPanner* -EqualPowerStereoPanner::factory (Panner& parent, ParamID who_cares) +EqualPowerStereoPanner::factory (Panner& parent, ParamID param) { - return new EqualPowerStereoPanner (parent); + return new EqualPowerStereoPanner (parent, param); } XMLNode& @@ -798,7 +800,7 @@ Panner::reset (uint32_t nouts, uint32_t npans) outputs.push_back (Output (1.0, 0)); for (n = 0; n < npans; ++n) { - push_back (new EqualPowerStereoPanner (*this)); + push_back (new EqualPowerStereoPanner (*this, ParamID(PanAutomation, n))); } break; |