diff options
author | David Robillard <d@drobilla.net> | 2008-09-29 22:47:40 +0000 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2008-09-29 22:47:40 +0000 |
commit | b5ec66ae6cb60fa43c343d3d29340b2370d0b9d1 (patch) | |
tree | 217722d96b61288f44477c69ac3bbe5d2e7d43f1 /libs/ardour/panner.cc | |
parent | 03f188cc8b17edc7c727f62b22b4577a2fdbfbe8 (diff) |
Can't call the wrong function when there's only one of them: remove ARDOUR::Parameter and just use Evoral::Parameter (move Ardour specific functionality to EventTypeMap where it belongs).
Less than pretty in places but easily seddable just in case...
git-svn-id: svn://localhost/ardour2/branches/3.0@3838 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/panner.cc')
-rw-r--r-- | libs/ardour/panner.cc | 26 |
1 files changed, 13 insertions, 13 deletions
diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index a0c85d35f6..3ff4caf4f3 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -69,7 +69,7 @@ static double direct_pan_to_control (pan_t val) { return val; } -StreamPanner::StreamPanner (Panner& p, Parameter param) +StreamPanner::StreamPanner (Panner& p, Evoral::Parameter param) : parent (p) , _control (new PanControllable(p.session(), X_("panner"), *this, param)) { @@ -179,7 +179,7 @@ StreamPanner::add_state (XMLNode& node) /*---------------------------------------------------------------------- */ -BaseStereoPanner::BaseStereoPanner (Panner& p, Parameter param) +BaseStereoPanner::BaseStereoPanner (Panner& p, Evoral::Parameter param) : StreamPanner (p, param) { } @@ -336,7 +336,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain /*---------------------------------------------------------------------- */ -EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p, Parameter param) +EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p, Evoral::Parameter param) : BaseStereoPanner (p, param) { update (); @@ -451,7 +451,7 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob } StreamPanner* -EqualPowerStereoPanner::factory (Panner& parent, Parameter param) +EqualPowerStereoPanner::factory (Panner& parent, Evoral::Parameter param) { return new EqualPowerStereoPanner (parent, param); } @@ -520,7 +520,7 @@ EqualPowerStereoPanner::set_state (const XMLNode& node) /*----------------------------------------------------------------------*/ -Multi2dPanner::Multi2dPanner (Panner& p, Parameter param) +Multi2dPanner::Multi2dPanner (Panner& p, Evoral::Parameter param) : StreamPanner (p, param) { update (); @@ -638,7 +638,7 @@ Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs, } StreamPanner* -Multi2dPanner::factory (Panner& p, Parameter param) +Multi2dPanner::factory (Panner& p, Evoral::Parameter param) { return new Multi2dPanner (p, param); } @@ -788,7 +788,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, Parameter(PanAutomation, n))); + push_back (new EqualPowerStereoPanner (*this, Evoral::Parameter(PanAutomation, n))); } break; @@ -798,7 +798,7 @@ Panner::reset (uint32_t nouts, uint32_t npans) outputs.push_back (Output (1.0, 1.0)); for (n = 0; n < npans; ++n) { - push_back (new Multi2dPanner (*this, Parameter(PanAutomation, n))); + push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, n))); } break; @@ -810,7 +810,7 @@ Panner::reset (uint32_t nouts, uint32_t npans) outputs.push_back (Output (0, 1.0)); for (n = 0; n < npans; ++n) { - push_back (new Multi2dPanner (*this, Parameter(PanAutomation, n))); + push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, n))); } break; @@ -823,7 +823,7 @@ Panner::reset (uint32_t nouts, uint32_t npans) outputs.push_back (Output (0.5, 0.75)); for (n = 0; n < npans; ++n) { - push_back (new Multi2dPanner (*this, Parameter(PanAutomation, n))); + push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, n))); } break; @@ -835,7 +835,7 @@ Panner::reset (uint32_t nouts, uint32_t npans) } for (n = 0; n < npans; ++n) { - push_back (new Multi2dPanner (*this, Parameter(PanAutomation, n))); + push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, n))); } break; @@ -969,7 +969,7 @@ Panner::clear_automation () struct PanPlugins { string name; uint32_t nouts; - StreamPanner* (*factory)(Panner&, Parameter); + StreamPanner* (*factory)(Panner&, Evoral::Parameter); }; PanPlugins pan_plugins[] = { @@ -1071,7 +1071,7 @@ Panner::set_state (const XMLNode& node) assumption, but its still an assumption. */ - sp = pan_plugins[i].factory (*this, Parameter(PanAutomation, 0)); + sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0)); if (sp->set_state (**niter) == 0) { push_back (sp); |