X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=libs%2Fardour%2Fpanner.cc;h=73326e12a4537cd82214eb7ce13a40dd57731535;hb=1aadfeba45e943123b6577bfca4635892be0d9e1;hp=a20342330fe4a9b4aef5d3c31dd17c4c61e114fe;hpb=ef0b9a740996c432a6a96180814d4f8d0ee16842;p=ardour.git diff --git a/libs/ardour/panner.cc b/libs/ardour/panner.cc index a20342330f..73326e12a4 100644 --- a/libs/ardour/panner.cc +++ b/libs/ardour/panner.cc @@ -32,21 +32,25 @@ #include -#include -#include -#include -#include +#include "pbd/error.h" +#include "pbd/failed_constructor.h" +#include "pbd/xml++.h" +#include "pbd/enumwriter.h" -#include -#include -#include +#include "evoral/Curve.hpp" -#include -#include +#include "ardour/session.h" +#include "ardour/panner.h" +#include "ardour/utils.h" +#include "ardour/audio_buffer.h" + +#include "ardour/runtime_functions.h" +#include "ardour/buffer_set.h" +#include "ardour/audio_buffer.h" #include "i18n.h" -#include +#include "pbd/mathfix.h" using namespace std; using namespace ARDOUR; @@ -65,18 +69,20 @@ static pan_t direct_control_to_pan (double fract) { return fract; } -static double direct_pan_to_control (pan_t val) { - return val; -} -StreamPanner::StreamPanner (Panner& p, ParamID param) +//static double direct_pan_to_control (pan_t val) { +// return val; +//} + +StreamPanner::StreamPanner (Panner& p, Evoral::Parameter param) : parent (p) - , _control (new PanControllable(p.session(), X_("panner"), *this, param)) { - _muted = false; + assert(param.type() != NullAutomation); - parent.session().add_controllable (_control); + _muted = false; + _control = boost::dynamic_pointer_cast( parent.control( param, true ) ); + x = 0.5; y = 0.5; z = 0.5; @@ -87,29 +93,16 @@ StreamPanner::~StreamPanner () } void -StreamPanner::PanControllable::set_value (float val) +Panner::PanControllable::set_value (float val) { - panner.set_position (direct_control_to_pan (val)); + panner.streampanner(parameter().id()).set_position (direct_control_to_pan (val)); + AutomationControl::set_value(val); } float -StreamPanner::PanControllable::get_value (void) const +Panner::PanControllable::get_value (void) const { - float xpos; - panner.get_effective_position (xpos); - return direct_pan_to_control (xpos); -} - -bool -StreamPanner::PanControllable::can_send_feedback () const -{ - AutoState astate = panner.get_parent().automation_state (); - - if ((astate == Play) || (astate == Touch && !panner.get_parent().touching())) { - return true; - } - - return false; + return AutomationControl::get_value(); } void @@ -189,8 +182,8 @@ StreamPanner::add_state (XMLNode& node) /*---------------------------------------------------------------------- */ -BaseStereoPanner::BaseStereoPanner (Panner& p) - : StreamPanner (p, ParamID(PanAutomation, 0)) +BaseStereoPanner::BaseStereoPanner (Panner& p, Evoral::Parameter param) + : StreamPanner (p, param) { } @@ -226,7 +219,7 @@ BaseStereoPanner::load (istream& in, string path, uint32_t& linecnt) /* now that we are done loading */ - _control->list()->StateChanged (); + ((AutomationList*)_control->list().get())->StateChanged (); return 0; } @@ -267,7 +260,7 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain pan = left * gain_coeff; - mix_buffers_with_gain(dst+n,src+n,nframes-n,pan); + mix_buffers_with_gain (dst+n,src+n,nframes-n,pan); } else { @@ -346,8 +339,8 @@ BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain /*---------------------------------------------------------------------- */ -EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p) - : BaseStereoPanner (p) +EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p, Evoral::Parameter param) + : BaseStereoPanner (p, param) { update (); @@ -386,7 +379,7 @@ EqualPowerStereoPanner::update () desired_right = panR * (scale * panR + 1.0f - scale); effective_x = x; - _control->set_value(x); + //_control->set_value(x); } void @@ -414,7 +407,6 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob if (nframes > 0) { effective_x = buffers[0][nframes-1]; - _control->set_value(effective_x); // signal, update UI } if (_muted) { @@ -461,9 +453,9 @@ EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& ob } StreamPanner* -EqualPowerStereoPanner::factory (Panner& parent, ParamID who_cares) +EqualPowerStereoPanner::factory (Panner& parent, Evoral::Parameter param) { - return new EqualPowerStereoPanner (parent); + return new EqualPowerStereoPanner (parent, param); } XMLNode& @@ -483,9 +475,7 @@ EqualPowerStereoPanner::state (bool full_state) root->add_property (X_("x"), buf); root->add_property (X_("type"), EqualPowerStereoPanner::name); - XMLNode* autonode = new XMLNode (X_("Automation")); - autonode->add_child_nocopy (_control->list()->state (full_state)); - root->add_child_nocopy (*autonode); + // XXX: dont save automation here... its part of the automatable panner now. StreamPanner::add_state (*root); @@ -510,16 +500,16 @@ EqualPowerStereoPanner::set_state (const XMLNode& node) for (XMLNodeConstIterator iter = node.children().begin(); iter != node.children().end(); ++iter) { - if ((*iter)->name() == X_("controllable")) { + if ((*iter)->name() == X_("Controllable")) { if ((prop = (*iter)->property("name")) != 0 && prop->value() == "panner") { _control->set_state (**iter); } } else if ((*iter)->name() == X_("Automation")) { - _control->list()->set_state (*((*iter)->children().front())); + _control->alist()->set_state (*((*iter)->children().front())); - if (_control->list()->automation_state() != Off) { + if (_control->alist()->automation_state() != Off) { set_position (_control->list()->eval (parent.session().transport_frame())); } } @@ -530,7 +520,7 @@ EqualPowerStereoPanner::set_state (const XMLNode& node) /*----------------------------------------------------------------------*/ -Multi2dPanner::Multi2dPanner (Panner& p, ParamID param) +Multi2dPanner::Multi2dPanner (Panner& p, Evoral::Parameter param) : StreamPanner (p, param) { update (); @@ -570,7 +560,6 @@ Multi2dPanner::update () } effective_x = x; - _control->set_value(x); } void @@ -648,7 +637,7 @@ Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs, } StreamPanner* -Multi2dPanner::factory (Panner& p, ParamID param) +Multi2dPanner::factory (Panner& p, Evoral::Parameter param) { return new Multi2dPanner (p, param); } @@ -714,8 +703,9 @@ Multi2dPanner::set_state (const XMLNode& node) /*---------------------------------------------------------------------- */ Panner::Panner (string name, Session& s) - : _session (s) + : Processor(s, name) { + //set_name_old_auto (name); set_name (name); _linked = false; @@ -747,6 +737,7 @@ Panner::set_link_direction (LinkDirection ld) } } + void Panner::set_bypassed (bool yn) { @@ -757,18 +748,98 @@ Panner::set_bypassed (bool yn) } +void +Panner::reset_to_default () +{ + vector positions; + + switch (outputs.size()) { + case 0: + case 1: + return; + } + + if (outputs.size() == 2) { + switch (_streampanners.size()) { + case 1: + _streampanners.front()->set_position (0.5); + _streampanners.front()->pan_control()->list()->reset_default (0.5); + return; + break; + case 2: + _streampanners.front()->set_position (0.0); + _streampanners.front()->pan_control()->list()->reset_default (0.0); + _streampanners.back()->set_position (1.0); + _streampanners.back()->pan_control()->list()->reset_default (1.0); + return; + default: + break; + } + } + + vector::iterator o; + vector::iterator p; + + for (o = outputs.begin(), p = _streampanners.begin(); o != outputs.end() && p != _streampanners.end(); ++o, ++p) { + (*p)->set_position ((*o).x, (*o).y); + } +} + +void +Panner::reset_streampanner (uint32_t which) +{ + if (which >= _streampanners.size() || which >= outputs.size()) { + return; + } + + switch (outputs.size()) { + case 0: + case 1: + return; + + case 2: + switch (_streampanners.size()) { + case 1: + /* stereo out, 1 stream, default = middle */ + _streampanners.front()->set_position (0.5); + _streampanners.front()->pan_control()->list()->reset_default (0.5); + break; + case 2: + /* stereo out, 2 streams, default = hard left/right */ + if (which == 0) { + _streampanners.front()->set_position (0.0); + _streampanners.front()->pan_control()->list()->reset_default (0.0); + } else { + _streampanners.back()->set_position (1.0); + _streampanners.back()->pan_control()->list()->reset_default (1.0); + } + break; + } + return; + + default: + _streampanners[which]->set_position (outputs[which].x, outputs[which].y); + } +} + void Panner::reset (uint32_t nouts, uint32_t npans) { uint32_t n; bool changed = false; + bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2)); - if (nouts < 2 || (nouts == outputs.size() && npans == size())) { + /* if new and old config don't need panning, or if + the config hasn't changed, we're done. + */ + + if (do_not_and_did_not_need_panning || + ((nouts == outputs.size()) && (npans == _streampanners.size()))) { return; } - n = size(); - clear (); + n = _streampanners.size(); + clear_panners (); if (n != npans) { changed = true; @@ -781,24 +852,30 @@ Panner::reset (uint32_t nouts, uint32_t npans) changed = true; } + if (nouts < 2) { + /* no need for panning with less than 2 outputs */ + goto send_changed; + } + switch (nouts) { case 0: + /* XXX: this can never happen */ break; case 1: + /* XXX: this can never happen */ fatal << _("programming error:") << X_("Panner::reset() called with a single output") << endmsg; /*NOTREACHED*/ break; - case 2: - /* line */ + case 2: // line outputs.push_back (Output (0, 0)); outputs.push_back (Output (1.0, 0)); for (n = 0; n < npans; ++n) { - push_back (new EqualPowerStereoPanner (*this)); + _streampanners.push_back (new EqualPowerStereoPanner (*this, Evoral::Parameter(PanAutomation, 0, n))); } break; @@ -808,7 +885,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, ParamID(PanAutomation, n))); + _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n))); } break; @@ -820,7 +897,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, ParamID(PanAutomation, n))); + _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n))); } break; @@ -833,7 +910,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, ParamID(PanAutomation, n))); + _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n))); } break; @@ -845,13 +922,13 @@ Panner::reset (uint32_t nouts, uint32_t npans) } for (n = 0; n < npans; ++n) { - push_back (new Multi2dPanner (*this, ParamID(PanAutomation, n))); + _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n))); } break; } - for (iterator x = begin(); x != end(); ++x) { + for (std::vector::iterator x = _streampanners.begin(); x != _streampanners.end(); ++x) { (*x)->update (); } @@ -867,21 +944,22 @@ Panner::reset (uint32_t nouts, uint32_t npans) float left; float right; - front()->get_position (left); - back()->get_position (right); + _streampanners.front()->get_position (left); + _streampanners.back()->get_position (right); if (changed || ((left == 0.5) && (right == 0.5))) { - front()->set_position (0.0); - front()->pan_control()->list()->reset_default (0.0); + _streampanners.front()->set_position (0.0); + _streampanners.front()->pan_control()->list()->reset_default (0.0); - back()->set_position (1.0); - back()->pan_control()->list()->reset_default (1.0); + _streampanners.back()->set_position (1.0); + _streampanners.back()->pan_control()->list()->reset_default (1.0); changed = true; } } + send_changed: if (changed) { Changed (); /* EMIT SIGNAL */ } @@ -893,29 +971,31 @@ void Panner::remove (uint32_t which) { vector::iterator i; - for (i = begin(); i != end() && which; ++i, --which); + for (i = _streampanners.begin(); i != _streampanners.end() && which; ++i, --which) {} - if (i != end()) { + if (i != _streampanners.end()) { delete *i; - erase (i); + _streampanners.erase (i); } } + +/** Remove all our StreamPanners */ void -Panner::clear () +Panner::clear_panners () { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { delete *i; } - vector::clear (); + _streampanners.clear (); } void Panner::set_automation_style (AutoStyle style) { - for (vector::iterator i = begin(); i != end(); ++i) { - (*i)->pan_control()->list()->set_automation_style (style); + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { + ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_style (style); } _session.set_dirty (); } @@ -923,8 +1003,8 @@ Panner::set_automation_style (AutoStyle style) void Panner::set_automation_state (AutoState state) { - for (vector::iterator i = begin(); i != end(); ++i) { - (*i)->pan_control()->list()->set_automation_state (state); + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { + ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_state (state); } _session.set_dirty (); } @@ -932,54 +1012,35 @@ Panner::set_automation_state (AutoState state) AutoState Panner::automation_state () const { + boost::shared_ptr l; if (!empty()) { - return front()->pan_control()->list()->automation_state (); - } else { - return Off; + boost::shared_ptr control = _streampanners.front()->pan_control(); + if (control) { + l = boost::dynamic_pointer_cast(control->list()); + } } + + return l ? l->automation_state() : Off; } AutoStyle Panner::automation_style () const { + boost::shared_ptr l; if (!empty()) { - return front()->pan_control()->list()->automation_style (); - } else { - return Absolute; - } -} - -void -Panner::transport_stopped (nframes_t frame) -{ - for (vector::iterator i = begin(); i != end(); ++i) { - (*i)->pan_control()->list()->reposition_for_rt_add (frame); - } -} - -void -Panner::snapshot (nframes_t now) -{ - for (vector::iterator i = begin(); i != end(); ++i) { - boost::shared_ptr list = (*i)->pan_control()->list(); - if (list->automation_write()) - list->rt_add(now, (*i)->pan_control()->get_value()); + boost::shared_ptr control = _streampanners.front()->pan_control(); + if (control) { + l = boost::dynamic_pointer_cast(control->list()); + } } -} -void -Panner::clear_automation () -{ - for (vector::iterator i = begin(); i != end(); ++i) { - (*i)->pan_control()->list()->clear (); - } - _session.set_dirty (); -} + return l ? l->automation_style() : Absolute; +} struct PanPlugins { string name; uint32_t nouts; - StreamPanner* (*factory)(Panner&, ParamID); + StreamPanner* (*factory)(Panner&, Evoral::Parameter); }; PanPlugins pan_plugins[] = { @@ -997,14 +1058,15 @@ Panner::get_state (void) XMLNode& Panner::state (bool full) { - XMLNode* root = new XMLNode (X_("Panner")); - char buf[32]; + XMLNode& node = Processor::state(full); + + node.add_property ("type", "panner"); - root->add_property (X_("linked"), (_linked ? "yes" : "no")); - root->add_property (X_("link_direction"), enum_2_string (_link_direction)); - root->add_property (X_("bypassed"), (bypassed() ? "yes" : "no")); + char buf[32]; - /* add each output */ + node.add_property (X_("linked"), (_linked ? "yes" : "no")); + node.add_property (X_("link_direction"), enum_2_string (_link_direction)); + node.add_property (X_("bypassed"), (bypassed() ? "yes" : "no")); for (vector::iterator o = outputs.begin(); o != outputs.end(); ++o) { XMLNode* onode = new XMLNode (X_("Output")); @@ -1012,14 +1074,15 @@ Panner::state (bool full) onode->add_property (X_("x"), buf); snprintf (buf, sizeof (buf), "%.12g", (*o).y); onode->add_property (X_("y"), buf); - root->add_child_nocopy (*onode); + node.add_child_nocopy (*onode); } - for (vector::const_iterator i = begin(); i != end(); ++i) { - root->add_child_nocopy ((*i)->state (full)); + for (vector::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { + node.add_child_nocopy ((*i)->state (full)); } - return *root; + + return node; } int @@ -1029,10 +1092,18 @@ 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")); - clear (); + clear_panners (); + + Processor::set_state(node); + + ChanCount ins = ChanCount::ZERO; + ChanCount outs = ChanCount::ZERO; + + // XXX: this might not be necessary anymore outputs.clear (); if ((prop = node.property (X_("linked"))) != 0) { @@ -1043,7 +1114,7 @@ Panner::set_state (const XMLNode& node) if ((prop = node.property (X_("bypassed"))) != 0) { set_bypassed (prop->value() == "yes"); } - + 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))); @@ -1078,13 +1149,14 @@ Panner::set_state (const XMLNode& node) /* note that we assume that all the stream panners are of the same type. pretty good - assumption, but its still an assumption. + assumption, but it's still an assumption. */ - sp = pan_plugins[i].factory (*this, ParamID(PanAutomation, 0)); + sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, num_panners)); + num_panners++; if (sp->set_state (**niter) == 0) { - push_back (sp); + _streampanners.push_back (sp); } break; @@ -1107,26 +1179,24 @@ Panner::set_state (const XMLNode& node) } } + reset (outputs.size (), num_panners); /* don't try to do old-school automation loading if it wasn't marked as existing */ if ((prop = node.property (X_("automation")))) { /* automation path is relative */ - automation_path = _session.automation_dir(); - automation_path += prop->value (); + automation_path = Glib::build_filename(_session.automation_dir(), prop->value ()); } return 0; } - - bool Panner::touching () const { - for (vector::const_iterator i = begin(); i != end(); ++i) { - if ((*i)->pan_control()->list()->touching ()) { + for (vector::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { + if (((AutomationList*)(*i)->pan_control()->list().get())->touching ()) { return true; } } @@ -1146,7 +1216,7 @@ Panner::set_position (float xpos, StreamPanner& orig) if (_link_direction == SameDirection) { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, true); } else { @@ -1159,7 +1229,7 @@ Panner::set_position (float xpos, StreamPanner& orig) } else { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, true); } else { @@ -1185,7 +1255,7 @@ Panner::set_position (float xpos, float ypos, StreamPanner& orig) if (_link_direction == SameDirection) { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, ypos, true); } else { @@ -1203,7 +1273,7 @@ Panner::set_position (float xpos, float ypos, StreamPanner& orig) } else { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, ypos, true); } else { @@ -1235,7 +1305,7 @@ Panner::set_position (float xpos, float ypos, float zpos, StreamPanner& orig) if (_link_direction == SameDirection) { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, ypos, zpos, true); } else { @@ -1256,7 +1326,7 @@ Panner::set_position (float xpos, float ypos, float zpos, StreamPanner& orig) } else { - for (vector::iterator i = begin(); i != end(); ++i) { + for (vector::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) { if (*i == &orig) { (*i)->set_position (xpos, ypos, true); } else { @@ -1278,7 +1348,7 @@ Panner::set_position (float xpos, float ypos, float zpos, StreamPanner& orig) } void -Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, nframes_t offset, gain_t gain_coeff) +Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, gain_t gain_coeff) { if (outbufs.count().n_audio() == 0) { // Don't want to lose audio... @@ -1299,19 +1369,21 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes /* only one output, and gain was zero, so make it silent */ - dst.silence(offset); + dst.silence (nframes); } else if (gain_coeff == 1.0f){ /* mix all buffers into the output */ // copy the first - dst.read_from(inbufs.get_audio(0), nframes, offset); + dst.read_from(inbufs.get_audio(0), nframes); // accumulate starting with the second - BufferSet::audio_iterator i = inbufs.audio_begin(); - for (++i; i != inbufs.audio_end(); ++i) { - dst.accumulate_from(*i, nframes, offset); + if (inbufs.count().n_audio() > 0) { + BufferSet::audio_iterator i = inbufs.audio_begin(); + for (++i; i != inbufs.audio_end(); ++i) { + dst.accumulate_from(*i, nframes); + } } } else { @@ -1319,12 +1391,14 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes /* mix all buffers into the output, scaling them all by the gain */ // copy the first - dst.read_from(inbufs.get_audio(0), nframes, offset); + dst.read_from(inbufs.get_audio(0), nframes); // accumulate (with gain) starting with the second - BufferSet::audio_iterator i = inbufs.audio_begin(); - for (++i; i != inbufs.audio_end(); ++i) { - dst.accumulate_with_gain_from(*i, nframes, offset, gain_coeff); + if (inbufs.count().n_audio() > 0) { + BufferSet::audio_iterator i = inbufs.audio_begin(); + for (++i; i != inbufs.audio_end(); ++i) { + dst.accumulate_with_gain_from(*i, nframes, gain_coeff); + } } } @@ -1334,18 +1408,18 @@ Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes /* the terrible silence ... */ for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) { - i->silence(nframes, offset); + i->silence(nframes); } BufferSet::audio_iterator i = inbufs.audio_begin(); - for (iterator pan = begin(); pan != end() && i != inbufs.audio_end(); ++pan, ++i) { + for (vector::iterator pan = _streampanners.begin(); pan != _streampanners.end() && i != inbufs.audio_end(); ++pan, ++i) { (*pan)->distribute (*i, outbufs, gain_coeff, nframes); } } void -Panner::distribute (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes, nframes_t offset) +Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, sframes_t start_frame, sframes_t end_frame, nframes_t nframes) { if (outbufs.count().n_audio() == 0) { // Failing to deliver audio we were asked to deliver is a bug @@ -1367,7 +1441,7 @@ Panner::distribute (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame gain_coeff = speed_quietning; } - distribute_no_automation(inbufs, outbufs, nframes, offset, gain_coeff); + distribute_no_automation(inbufs, outbufs, nframes, gain_coeff); return; } @@ -1380,42 +1454,41 @@ Panner::distribute (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame // FIXME: apply gain automation? // copy the first - dst.read_from(inbufs.get_audio(0), nframes, offset); + dst.read_from(inbufs.get_audio(0), nframes); // accumulate starting with the second BufferSet::audio_iterator i = inbufs.audio_begin(); for (++i; i != inbufs.audio_end(); ++i) { - dst.accumulate_from(*i, nframes, offset); + dst.accumulate_from(*i, nframes); } return; } // More than 1 output, we should have 1 panner for each input - assert(size() == inbufs.count().n_audio()); + //assert(_streampanners.size() == inbufs.count().n_audio()); /* the terrible silence ... */ for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) { - i->silence(nframes, offset); + i->silence(nframes); } BufferSet::audio_iterator i = inbufs.audio_begin(); - for (iterator pan = begin(); pan != end(); ++pan, ++i) { + for (vector::iterator pan = _streampanners.begin(); pan != _streampanners.end(); ++pan, ++i) { (*pan)->distribute_automated (*i, outbufs, start_frame, end_frame, nframes, _session.pan_automation_buffer()); } } /* old school automation handling */ +/* void Panner::set_name (string str) { - automation_path = _session.automation_dir(); - automation_path += _session.snap_name(); - automation_path += "-pan-"; - automation_path += legalize_for_path (str); - automation_path += ".automation"; + automation_path = Glib::build_filename(_session.automation_dir(), + _session.snap_name() + "-pan-" + legalize_for_path (str) + ".automation"); } +*/ int Panner::load () @@ -1423,7 +1496,7 @@ Panner::load () char line[128]; uint32_t linecnt = 0; float version; - iterator sp; + vector::iterator sp; LocaleGuard lg (X_("POSIX")); if (automation_path.length() == 0) { @@ -1443,7 +1516,7 @@ Panner::load () return -1; } - sp = begin(); + sp = _streampanners.begin(); while (in.getline (line, sizeof(line), '\n')) { @@ -1468,7 +1541,7 @@ Panner::load () if (strcmp (line, "begin") == 0) { - if (sp == end()) { + if (sp == _streampanners.end()) { error << string_compose (_("too many panner states found in pan automation file %1"), automation_path) << endmsg;