*/
+#define __STDC_FORMAT_MACROS 1
+#include <inttypes.h>
+
#include <cmath>
#include <cerrno>
#include <fstream>
#include <ardour/panner.h>
#include <ardour/utils.h>
-#include <ardour/mix.h>
+#include <ardour/runtime_functions.h>
+#include <ardour/buffer_set.h>
#include "i18n.h"
StreamPanner::StreamPanner (Panner& p)
: parent (p),
- _control (X_("panner"), *this)
+ _control (new PanControllable(p.session(), X_("panner"), *this))
{
_muted = false;
- parent.session().add_controllable (&_control);
+ parent.session().add_controllable (_control);
x = 0.5;
y = 0.5;
x = xpos;
update ();
Changed ();
- _control.Changed ();
+ _control->Changed ();
}
}
/*---------------------------------------------------------------------- */
BaseStereoPanner::BaseStereoPanner (Panner& p)
- : StreamPanner (p), _automation (0.0, 1.0, 0.5)
+ : StreamPanner (p)
{
}
{
}
-void
-BaseStereoPanner::snapshot (nframes_t now)
-{
- if (_automation.automation_state() == Write || _automation.automation_state() == Touch) {
- _automation.rt_add (now, x);
- }
-}
-
-void
-BaseStereoPanner::transport_stopped (nframes_t frame)
-{
- _automation.reposition_for_rt_add (frame);
-
- if (_automation.automation_state() != Off) {
- set_position (_automation.eval (frame));
- }
-}
-
-void
-BaseStereoPanner::set_automation_style (AutoStyle style)
-{
- _automation.set_automation_style (style);
-}
-
-void
-BaseStereoPanner::set_automation_state (AutoState state)
-{
- if (state != _automation.automation_state()) {
-
- _automation.set_automation_state (state);
-
- if (state != Off) {
- set_position (_automation.eval (parent.session().transport_frame()));
- }
- }
-}
-
int
BaseStereoPanner::load (istream& in, string path, uint32_t& linecnt)
{
char line[128];
LocaleGuard lg (X_("POSIX"));
- _automation.clear ();
+ _control->list()->clear ();
while (in.getline (line, sizeof (line), '\n')) {
- jack_nframes_t when;
+ nframes_t when;
double value;
++linecnt;
continue;
}
- _automation.fast_simple_add (when, value);
+ _control->list()->fast_simple_add (when, value);
}
/* now that we are done loading */
- _automation.StateChanged ();
+ _control->list()->StateChanged ();
return 0;
}
void
-BaseStereoPanner::distribute (Sample* src, Sample** obufs, gain_t gain_coeff, nframes_t nframes)
+BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
{
+ assert(obufs.count().n_audio() == 2);
+
pan_t delta;
Sample* dst;
pan_t pan;
if (_muted) {
return;
}
+
+ Sample* const src = srcbuf.data();
/* LEFT */
- dst = obufs[0];
+ dst = obufs.get_audio(0).data();
if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
pan = left * gain_coeff;
- Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
+ mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
} else {
if (pan != 0.0f) {
- Session::mix_buffers_with_gain(dst,src,nframes,pan);
+ mix_buffers_with_gain(dst,src,nframes,pan);
/* mark that we wrote into the buffer */
} else {
- Session::mix_buffers_no_gain(dst,src,nframes);
+ mix_buffers_no_gain(dst,src,nframes);
/* mark that we wrote into the buffer */
/* RIGHT */
- dst = obufs[1];
+ dst = obufs.get_audio(1).data();
if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
pan = right * gain_coeff;
- Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
+ mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
/* XXX it would be nice to mark the buffer as written to */
if (pan != 0.0f) {
- Session::mix_buffers_with_gain(dst,src,nframes,pan);
+ mix_buffers_with_gain(dst,src,nframes,pan);
/* XXX it would be nice to mark the buffer as written to */
}
} else {
- Session::mix_buffers_no_gain(dst,src,nframes);
+ mix_buffers_no_gain(dst,src,nframes);
/* XXX it would be nice to mark the buffer as written to */
}
}
void
-EqualPowerStereoPanner::distribute_automated (Sample* src, Sample** obufs,
+EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& obufs,
nframes_t start, nframes_t end, nframes_t nframes,
pan_t** buffers)
{
+ assert(obufs.count().n_audio() == 2);
+
Sample* dst;
pan_t* pbuf;
+ Sample* const src = srcbuf.data();
/* fetch positional data */
- if (!_automation.rt_safe_get_vector (start, end, buffers[0], nframes)) {
+ if (!_control->list()->curve().rt_safe_get_vector (start, end, buffers[0], nframes)) {
/* fallback */
if (!_muted) {
- distribute (src, obufs, 1.0, nframes);
+ distribute (srcbuf, obufs, 1.0, nframes);
}
return;
}
/* LEFT */
- dst = obufs[0];
+ dst = obufs.get_audio(0).data();
pbuf = buffers[0];
for (nframes_t n = 0; n < nframes; ++n) {
dst[n] += src[n] * pbuf[n];
}
- /* XXX it would be nice to mark the buffer as written to */
+ /* XXX it would be nice to mark the buffer as written to */
/* RIGHT */
- dst = obufs[1];
+ dst = obufs.get_audio(1).data();
pbuf = buffers[1];
for (nframes_t n = 0; n < nframes; ++n) {
dst[n] += src[n] * pbuf[n];
}
- /* XXX it would be nice to mark the buffer as written to */
+ /* XXX it would be nice to mark the buffer as written to */
}
StreamPanner*
root->add_property (X_("type"), EqualPowerStereoPanner::name);
XMLNode* autonode = new XMLNode (X_("Automation"));
- autonode->add_child_nocopy (_automation.state (full_state));
+ autonode->add_child_nocopy (_control->list()->state (full_state));
root->add_child_nocopy (*autonode);
StreamPanner::add_state (*root);
- root->add_child_nocopy (_control.get_state ());
+ root->add_child_nocopy (_control->get_state ());
return *root;
}
if ((*iter)->name() == X_("controllable")) {
if ((prop = (*iter)->property("name")) != 0 && prop->value() == "panner") {
- _control.set_state (**iter);
+ _control->set_state (**iter);
}
} else if ((*iter)->name() == X_("Automation")) {
- _automation.set_state (*((*iter)->children().front()));
+ _control->list()->set_state (*((*iter)->children().front()));
- if (_automation.automation_state() != Off) {
- set_position (_automation.eval (parent.session().transport_frame()));
+ if (_control->list()->automation_state() != Off) {
+ set_position (_control->list()->eval (parent.session().transport_frame()));
}
}
}
/*----------------------------------------------------------------------*/
Multi2dPanner::Multi2dPanner (Panner& p)
- : StreamPanner (p), _automation (0.0, 1.0, 0.5) // XXX useless
+ : StreamPanner (p)
{
update ();
}
{
}
-void
-Multi2dPanner::snapshot (nframes_t now)
-{
- // how?
-}
-
-void
-Multi2dPanner::transport_stopped (nframes_t frame)
-{
- //what?
-}
-
-void
-Multi2dPanner::set_automation_style (AutoStyle style)
-{
- //what?
-}
-
-void
-Multi2dPanner::set_automation_state (AutoState state)
-{
- // what?
-}
-
void
Multi2dPanner::update ()
{
}
void
-Multi2dPanner::distribute (Sample* src, Sample** obufs, gain_t gain_coeff, nframes_t nframes)
+Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
{
Sample* dst;
pan_t pan;
if (_muted) {
return;
}
+
+ Sample* const src = srcbuf.data();
for (n = 0, o = parent.outputs.begin(); o != parent.outputs.end(); ++o, ++n) {
- dst = obufs[n];
+ dst = obufs.get_audio(n).data();
#ifdef CAN_INTERP
if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc
}
pan = left * gain_coeff;
-
- for (; n < nframes; ++n) {
- dst[n] += src[n] * pan;
- }
+ mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
} else {
if ((pan *= gain_coeff) != 1.0f) {
if (pan != 0.0f) {
-
- for (nframes_t n = 0; n < nframes; ++n) {
- dst[n] += src[n] * pan;
- }
-
+ mix_buffers_with_gain(dst,src,nframes,pan);
}
-
-
} else {
-
- for (nframes_t n = 0; n < nframes; ++n) {
- dst[n] += src[n];
- }
-
+ mix_buffers_no_gain(dst,src,nframes);
}
#endif
#ifdef CAN_INTERP
}
void
-Multi2dPanner::distribute_automated (Sample* src, Sample** obufs,
+Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs,
nframes_t start, nframes_t end, nframes_t nframes,
pan_t** buffers)
{
if (changed || ((left == 0.5) && (right == 0.5))) {
front()->set_position (0.0);
- front()->automation().reset_default (0.0);
+ front()->pan_control()->list()->reset_default (0.0);
back()->set_position (1.0);
- back()->automation().reset_default (1.0);
+ back()->pan_control()->list()->reset_default (1.0);
changed = true;
}
Panner::set_automation_style (AutoStyle style)
{
for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->set_automation_style (style);
+ (*i)->pan_control()->list()->set_automation_style (style);
}
_session.set_dirty ();
}
Panner::set_automation_state (AutoState state)
{
for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->set_automation_state (state);
+ (*i)->pan_control()->list()->set_automation_state (state);
}
_session.set_dirty ();
}
Panner::automation_state () const
{
if (!empty()) {
- return front()->automation().automation_state ();
+ return front()->pan_control()->list()->automation_state ();
} else {
return Off;
}
Panner::automation_style () const
{
if (!empty()) {
- return front()->automation().automation_style ();
+ return front()->pan_control()->list()->automation_style ();
} else {
return Absolute;
}
Panner::transport_stopped (nframes_t frame)
{
for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->transport_stopped (frame);
+ (*i)->pan_control()->list()->reposition_for_rt_add (frame);
}
}
Panner::snapshot (nframes_t now)
{
for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->snapshot (now);
+ boost::shared_ptr<AutomationList> list = (*i)->pan_control()->list();
+ if (list->automation_write())
+ list->rt_add(now, (*i)->pan_control()->get_value());
}
}
Panner::clear_automation ()
{
for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->automation().clear ();
+ (*i)->pan_control()->list()->clear ();
}
_session.set_dirty ();
}
Panner::touching () const
{
for (vector<StreamPanner*>::const_iterator i = begin(); i != end(); ++i) {
- if ((*i)->automation().touching ()) {
+ if ((*i)->pan_control()->list()->touching ()) {
return true;
}
}
}
}
+void
+Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, nframes_t offset, gain_t gain_coeff)
+{
+ if (outbufs.count().n_audio() == 0) {
+ // Don't want to lose audio...
+ assert(inbufs.count().n_audio() == 0);
+ return;
+ }
+
+ // We shouldn't be called in the first place...
+ assert(!bypassed());
+ assert(!empty());
+
+
+ if (outbufs.count().n_audio() == 1) {
+
+ AudioBuffer& dst = outbufs.get_audio(0);
+
+ if (gain_coeff == 0.0f) {
+
+ /* only one output, and gain was zero, so make it silent */
+
+ dst.silence(offset);
+
+ } else if (gain_coeff == 1.0f){
+
+ /* mix all buffers into the output */
+
+ // copy the first
+ dst.read_from(inbufs.get_audio(0), nframes, offset);
+
+ // 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);
+ }
+
+ } else {
+
+ /* mix all buffers into the output, scaling them all by the gain */
+
+ // copy the first
+ dst.read_from(inbufs.get_audio(0), nframes, offset);
+
+ // 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);
+ }
+
+ }
+
+ return;
+ }
+
+ /* the terrible silence ... */
+ for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) {
+ i->silence(nframes, offset);
+ }
+
+ BufferSet::audio_iterator i = inbufs.audio_begin();
+
+ for (iterator pan = begin(); pan != 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)
+{
+ if (outbufs.count().n_audio() == 0) {
+ // Failing to deliver audio we were asked to deliver is a bug
+ assert(inbufs.count().n_audio() == 0);
+ return;
+ }
+
+ // We shouldn't be called in the first place...
+ assert(!bypassed());
+ assert(!empty());
+
+ // If we shouldn't play automation defer to distribute_no_automation
+ if ( !( automation_state() & Play ||
+ ((automation_state() & Touch) && !touching()) ) ) {
+
+ // Speed quietning
+ gain_t gain_coeff = 1.0;
+ if (fabsf(_session.transport_speed()) > 1.5f) {
+ gain_coeff = speed_quietning;
+ }
+
+ distribute_no_automation(inbufs, outbufs, nframes, offset, gain_coeff);
+ return;
+ }
+
+ // Otherwise.. let the automation flow, baby
+
+ if (outbufs.count().n_audio() == 1) {
+
+ AudioBuffer& dst = outbufs.get_audio(0);
+
+ // FIXME: apply gain automation?
+
+ // copy the first
+ dst.read_from(inbufs.get_audio(0), nframes, offset);
+
+ // 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);
+ }
+
+ return;
+ }
+
+ // More than 1 output, we should have 1 panner for each input
+ assert(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);
+ }
+
+ BufferSet::audio_iterator i = inbufs.audio_begin();
+ for (iterator pan = begin(); pan != end(); ++pan, ++i) {
+ (*pan)->distribute_automated (*i, outbufs, start_frame, end_frame, nframes, _session.pan_automation_buffer());
+ }
+}
+
/* old school automation handling */
void