/*
- Copyright (C) 2004 Paul Davis
+ Copyright (C) 2004 Paul Davis
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
*/
-#define __STDC_FORMAT_MACROS 1
#include <inttypes.h>
#include <cmath>
#include <locale.h>
#include <unistd.h>
#include <float.h>
+#include <iomanip>
#include <glibmm.h>
+#include "pbd/cartesian.h"
#include "pbd/error.h"
#include "pbd/failed_constructor.h"
#include "pbd/xml++.h"
#include "ardour/runtime_functions.h"
#include "ardour/buffer_set.h"
#include "ardour/audio_buffer.h"
+#include "ardour/vbap.h"
#include "i18n.h"
string EqualPowerStereoPanner::name = "Equal Power Stereo";
string Multi2dPanner::name = "Multiple (2D)";
-/* this is a default mapper of control values to a pan position
- others can be imagined.
+/* this is a default mapper of control values to a pan position
+ others can be imagined.
*/
-static pan_t direct_control_to_pan (double fract) {
+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, Evoral::Parameter param)
: parent (p)
{
- assert(param.type() != NullAutomation);
+ assert (param.type() != NullAutomation);
_muted = false;
+ _mono = false;
- _control = boost::dynamic_pointer_cast<AutomationControl>( parent.control( param, true ) );
-
- x = 0.5;
- y = 0.5;
- z = 0.5;
+ /* get our AutomationControl from our parent Panner, creating it if required */
+ _control = boost::dynamic_pointer_cast<AutomationControl> (parent.control (param, true));
+
+ _x = 0.5;
+ _y = 0.5;
+ _z = 0.5;
}
StreamPanner::~StreamPanner ()
}
void
-Panner::PanControllable::set_value (float val)
+StreamPanner::set_mono (bool yn)
+{
+ if (yn != _mono) {
+ _mono = yn;
+ StateChanged ();
+ }
+}
+
+void
+Panner::PanControllable::set_value (double val)
{
- panner.streampanner(parameter().id()).set_position (direct_control_to_pan (val));
+ panner.streampanner (parameter().id()).set_position (direct_control_to_pan (val));
AutomationControl::set_value(val);
}
-float
+double
Panner::PanControllable::get_value (void) const
{
return AutomationControl::get_value();
parent.set_position (xpos, *this);
}
- if (x != xpos) {
- x = xpos;
+ if (_x != xpos) {
+ _x = xpos;
update ();
Changed ();
_control->Changed ();
parent.set_position (xpos, ypos, *this);
}
- if (x != xpos || y != ypos) {
-
- x = xpos;
- y = ypos;
+ if (_x != xpos || _y != ypos) {
+ _x = xpos;
+ _y = ypos;
update ();
Changed ();
+ _control->Changed ();
}
}
parent.set_position (xpos, ypos, zpos, *this);
}
- if (x != xpos || y != ypos || z != zpos) {
- x = xpos;
- y = ypos;
- z = zpos;
+ if (_x != xpos || _y != ypos || _z != zpos) {
+ _x = xpos;
+ _y = ypos;
+ _z = zpos;
update ();
Changed ();
+ _control->Changed ();
}
}
int
-StreamPanner::set_state (const XMLNode& node)
+StreamPanner::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty* prop;
XMLNodeConstIterator iter;
if ((prop = node.property (X_("muted")))) {
- set_muted (prop->value() == "yes");
+ set_muted (string_is_affirmative (prop->value()));
+ }
+
+ if ((prop = node.property (X_("mono")))) {
+ set_mono (string_is_affirmative (prop->value()));
}
return 0;
StreamPanner::add_state (XMLNode& node)
{
node.add_property (X_("muted"), (muted() ? "yes" : "no"));
+ node.add_property (X_("mono"), (_mono ? "yes" : "no"));
+}
+
+void
+StreamPanner::distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+{
+ if (_mono) {
+ /* we're in mono mode, so just pan the input to all outputs equally */
+ int const N = parent.nouts ();
+ for (int i = 0; i < N; ++i) {
+ mix_buffers_with_gain (obufs.get_audio(i).data(), src.data(), nframes, gain_coeff);
+ }
+ } else {
+ /* normal mode, call the `real' distribute method */
+ do_distribute (src, obufs, gain_coeff, nframes);
+ }
+}
+
+void
+StreamPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs,
+ nframes_t start, nframes_t end, nframes_t nframes, pan_t** buffers)
+{
+ if (_mono) {
+ /* we're in mono mode, so just pan the input to all outputs equally */
+ int const N = parent.nouts ();
+ for (int i = 0; i < N; ++i) {
+ mix_buffers_with_gain (obufs.get_audio(i).data(), src.data(), nframes, 1.0);
+ }
+ } else {
+ /* normal mode, call the `real' distribute method */
+ do_distribute_automated (src, obufs, start, end, nframes, buffers);
+ }
+
}
+
/*---------------------------------------------------------------------- */
BaseStereoPanner::BaseStereoPanner (Panner& p, Evoral::Parameter param)
: StreamPanner (p, param)
+ , left (0.5)
+ , right (0.5)
+ , left_interp (left)
+ , right_interp (right)
{
}
{
char line[128];
LocaleGuard lg (X_("POSIX"));
-
+
_control->list()->clear ();
while (in.getline (line, sizeof (line), '\n')) {
}
void
-BaseStereoPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+BaseStereoPanner::do_distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
{
assert(obufs.count().n_audio() == 2);
if (_muted) {
return;
}
-
+
Sample* const src = srcbuf.data();
/* LEFT */
dst = obufs.get_audio(0).data();
- if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
-
- /* interpolate over 64 frames or nframes, whichever is smaller */
-
- nframes_t limit = min ((nframes_t)64, nframes);
+ if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
+
+ /* we've moving the pan by an appreciable amount, so we must
+ interpolate over 64 frames or nframes, whichever is smaller */
+
+ nframes_t const limit = min ((nframes_t)64, nframes);
nframes_t n;
delta = -(delta / (float) (limit));
-
+
for (n = 0; n < limit; n++) {
left_interp = left_interp + delta;
left = left_interp + 0.9 * (left - left_interp);
dst[n] += src[n] * left * gain_coeff;
}
-
+
+ /* then pan the rest of the buffer; no need for interpolation for this bit */
+
pan = left * gain_coeff;
mix_buffers_with_gain (dst+n,src+n,nframes-n,pan);
-
+
} else {
-
+
left = desired_left;
left_interp = left;
if ((pan = (left * gain_coeff)) != 1.0f) {
-
+
if (pan != 0.0f) {
-
+
+ /* pan is 1 but also not 0, so we must do it "properly" */
+
mix_buffers_with_gain(dst,src,nframes,pan);
/* mark that we wrote into the buffer */
// obufs[0] = 0;
- }
-
+ }
+
} else {
-
+
+ /* pan is 1 so we can just copy the input samples straight in */
+
mix_buffers_no_gain(dst,src,nframes);
-
+
/* mark that we wrote into the buffer */
-
+
// obufs[0] = 0;
}
}
/* RIGHT */
dst = obufs.get_audio(1).data();
-
- if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
-
- /* interpolate over 64 frames or nframes, whichever is smaller */
-
- nframes_t limit = min ((nframes_t)64, nframes);
+
+ if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
+
+ /* we're moving the pan by an appreciable amount, so we must
+ interpolate over 64 frames or nframes, whichever is smaller */
+
+ nframes_t const limit = min ((nframes_t)64, nframes);
nframes_t n;
delta = -(delta / (float) (limit));
right = right_interp + 0.9 * (right - right_interp);
dst[n] += src[n] * right * gain_coeff;
}
-
+
+ /* then pan the rest of the buffer, no need for interpolation for this bit */
+
pan = right * gain_coeff;
-
+
mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
-
+
/* XXX it would be nice to mark the buffer as written to */
} else {
right = desired_right;
right_interp = right;
-
+
if ((pan = (right * gain_coeff)) != 1.0f) {
-
+
if (pan != 0.0f) {
+
+ /* pan is not 1 but also not 0, so we must do it "properly" */
mix_buffers_with_gain(dst,src,nframes,pan);
-
+
/* XXX it would be nice to mark the buffer as written to */
}
-
+
} else {
+
+ /* pan is 1 so we can just copy the input samples straight in */
mix_buffers_no_gain(dst,src,nframes);
-
+
/* XXX it would be nice to mark the buffer as written to */
}
}
EqualPowerStereoPanner::update ()
{
/* it would be very nice to split this out into a virtual function
- that can be accessed from BaseStereoPanner and used in distribute_automated().
-
- but the place where its used in distribute_automated() is a tight inner loop,
+ that can be accessed from BaseStereoPanner and used in do_distribute_automated().
+
+ but the place where its used in do_distribute_automated() is a tight inner loop,
and making "nframes" virtual function calls to compute values is an absurd
overhead.
*/
x == 1 => hard right
*/
- float panR = x;
- float panL = 1 - panR;
+ float const panR = _x;
+ float const panL = 1 - panR;
+
+ float const pan_law_attenuation = -3.0f;
+ float const scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
- const float pan_law_attenuation = -3.0f;
- const float scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
-
desired_left = panL * (scale * panL + 1.0f - scale);
desired_right = panR * (scale * panR + 1.0f - scale);
- effective_x = x;
+ effective_x = _x;
//_control->set_value(x);
}
void
-EqualPowerStereoPanner::distribute_automated (AudioBuffer& srcbuf, BufferSet& obufs,
- nframes_t start, nframes_t end, nframes_t nframes,
- pan_t** buffers)
+EqualPowerStereoPanner::do_distribute_automated (AudioBuffer& srcbuf, BufferSet& obufs,
+ nframes_t start, nframes_t end, nframes_t nframes,
+ pan_t** buffers)
{
- assert(obufs.count().n_audio() == 2);
+ assert (obufs.count().n_audio() == 2);
Sample* dst;
pan_t* pbuf;
if (!_control->list()->curve().rt_safe_get_vector (start, end, buffers[0], nframes)) {
/* fallback */
if (!_muted) {
- distribute (srcbuf, obufs, 1.0, nframes);
+ do_distribute (srcbuf, obufs, 1.0, nframes);
}
return;
}
for (nframes_t n = 0; n < nframes; ++n) {
- float panR = buffers[0][n];
- float panL = 1 - panR;
-
+ float const panR = buffers[0][n];
+ float const panL = 1 - panR;
+
buffers[0][n] = panL * (scale * panL + 1.0f - scale);
buffers[1][n] = panR * (scale * panR + 1.0f - scale);
}
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 */
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 */
}
}
XMLNode&
-EqualPowerStereoPanner::state (bool full_state)
+EqualPowerStereoPanner::state (bool /*full_state*/)
{
XMLNode* root = new XMLNode ("StreamPanner");
char buf[64];
LocaleGuard lg (X_("POSIX"));
- snprintf (buf, sizeof (buf), "%.12g", x);
+ snprintf (buf, sizeof (buf), "%.12g", _x);
root->add_property (X_("x"), buf);
root->add_property (X_("type"), EqualPowerStereoPanner::name);
}
int
-EqualPowerStereoPanner::set_state (const XMLNode& node)
+EqualPowerStereoPanner::set_state (const XMLNode& node, int version)
{
const XMLProperty* prop;
- float pos;
LocaleGuard lg (X_("POSIX"));
if ((prop = node.property (X_("x")))) {
- pos = atof (prop->value().c_str());
+ const float pos = atof (prop->value().c_str());
set_position (pos, true);
- }
+ }
- StreamPanner::set_state (node);
+ StreamPanner::set_state (node, version);
for (XMLNodeConstIterator iter = node.children().begin(); iter != node.children().end(); ++iter) {
if ((*iter)->name() == X_("Controllable")) {
if ((prop = (*iter)->property("name")) != 0 && prop->value() == "panner") {
- _control->set_state (**iter);
+ _control->set_state (**iter, version);
}
} else if ((*iter)->name() == X_("Automation")) {
- _control->alist()->set_state (*((*iter)->children().front()));
+ _control->alist()->set_state (*((*iter)->children().front()), version);
if (_control->alist()->automation_state() != Off) {
set_position (_control->list()->eval (parent.session().transport_frame()));
{
static const float BIAS = FLT_MIN;
uint32_t i;
- uint32_t nouts = parent.outputs.size();
+ uint32_t const nouts = parent.nouts ();
float dsq[nouts];
float f, fr;
vector<pan_t> pans;
f = 0.0f;
for (i = 0; i < nouts; i++) {
- dsq[i] = ((x - parent.outputs[i].x) * (x - parent.outputs[i].x) + (y - parent.outputs[i].y) * (y - parent.outputs[i].y) + BIAS);
+ dsq[i] = ((_x - parent.output(i).x) * (_x - parent.output(i).x) + (_y - parent.output(i).y) * (_y - parent.output(i).y) + BIAS);
if (dsq[i] < 0.0) {
dsq[i] = 0.0;
}
fr = (float) (1.0 / sqrt((double)f));
#else
fr = 1.0 / sqrtf(f);
-#endif
+#endif
for (i = 0; i < nouts; ++i) {
- parent.outputs[i].desired_pan = 1.0f - (dsq[i] * fr);
+ parent.output(i).desired_pan = 1.0f - (dsq[i] * fr);
}
- effective_x = x;
+ effective_x = _x;
}
void
-Multi2dPanner::distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
+Multi2dPanner::do_distribute (AudioBuffer& srcbuf, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
{
Sample* dst;
pan_t pan;
- vector<Panner::Output>::iterator o;
- uint32_t n;
if (_muted) {
return;
}
-
- Sample* const src = srcbuf.data();
+ Sample* const src = srcbuf.data();
- for (n = 0, o = parent.outputs.begin(); o != parent.outputs.end(); ++o, ++n) {
+ uint32_t const N = parent.nouts ();
+ for (uint32_t n = 0; n < N; ++n) {
+ Panner::Output& o = parent.output (n);
dst = obufs.get_audio(n).data();
-
+
#ifdef CAN_INTERP
- if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc
-
+ if (fabsf ((delta = (left_interp - desired_left))) > 0.002) { // about 1 degree of arc
+
/* interpolate over 64 frames or nframes, whichever is smaller */
-
+
nframes_t limit = min ((nframes_t)64, nframes);
nframes_t n;
-
+
delta = -(delta / (float) (limit));
-
+
for (n = 0; n < limit; n++) {
left_interp = left_interp + delta;
left = left_interp + 0.9 * (left - left_interp);
dst[n] += src[n] * left * gain_coeff;
}
-
+
pan = left * gain_coeff;
mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
-
+
} else {
-#else
- pan = (*o).desired_pan;
-
+#else
+ pan = o.desired_pan;
+
if ((pan *= gain_coeff) != 1.0f) {
-
+
if (pan != 0.0f) {
mix_buffers_with_gain(dst,src,nframes,pan);
- }
+ }
+
} else {
mix_buffers_no_gain(dst,src,nframes);
}
}
#endif
}
-
+
return;
}
void
-Multi2dPanner::distribute_automated (AudioBuffer& src, BufferSet& obufs,
- nframes_t start, nframes_t end, nframes_t nframes,
- pan_t** buffers)
+Multi2dPanner::do_distribute_automated (AudioBuffer& /*src*/, BufferSet& /*obufs*/,
+ nframes_t /*start*/, nframes_t /*end*/, nframes_t /*nframes*/,
+ pan_t** /*buffers*/)
{
if (_muted) {
return;
}
int
-Multi2dPanner::load (istream& in, string path, uint32_t& linecnt)
+Multi2dPanner::load (istream& /*in*/, string /*path*/, uint32_t& /*linecnt*/)
{
return 0;
}
}
XMLNode&
-Multi2dPanner::state (bool full_state)
+Multi2dPanner::state (bool /*full_state*/)
{
XMLNode* root = new XMLNode ("StreamPanner");
char buf[64];
LocaleGuard lg (X_("POSIX"));
- snprintf (buf, sizeof (buf), "%.12g", x);
+ snprintf (buf, sizeof (buf), "%.12g", _x);
root->add_property (X_("x"), buf);
- snprintf (buf, sizeof (buf), "%.12g", y);
+ snprintf (buf, sizeof (buf), "%.12g", _y);
root->add_property (X_("y"), buf);
root->add_property (X_("type"), Multi2dPanner::name);
}
int
-Multi2dPanner::set_state (const XMLNode& node)
+Multi2dPanner::set_state (const XMLNode& node, int /*version*/)
{
const XMLProperty* prop;
float newx,newy;
if ((prop = node.property (X_("x")))) {
newx = atof (prop->value().c_str());
}
-
+
if ((prop = node.property (X_("y")))) {
newy = atof (prop->value().c_str());
}
-
- if (x < 0 || y < 0) {
+
+ if (_x < 0 || _y < 0) {
error << _("badly-formed positional data for Multi2dPanner - ignored")
<< endmsg;
return -1;
- }
-
+ }
+
set_position (newx, newy);
return 0;
}
/*---------------------------------------------------------------------- */
Panner::Panner (string name, Session& s)
- : Processor(s, name)
+ : SessionObject (s, name)
+ , Automatable (s)
{
//set_name_old_auto (name);
set_name (name);
_linked = false;
_link_direction = SameDirection;
_bypassed = false;
+ _mono = false;
}
Panner::~Panner ()
case 1:
return;
}
-
+
if (outputs.size() == 2) {
switch (_streampanners.size()) {
case 1:
break;
}
}
-
+
vector<Output>::iterator o;
vector<StreamPanner*>::iterator p;
if (which >= _streampanners.size() || which >= outputs.size()) {
return;
}
-
+
switch (outputs.size()) {
case 0:
case 1:
}
}
+/**
+ * Reset the panner with a given number of outs and panners (and hence inputs)
+ *
+ * \param nouts Number of outputs.
+ * \param npans Number of panners.
+ */
void
Panner::reset (uint32_t nouts, uint32_t npans)
{
bool changed = false;
bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2));
- /* if new and old config don't need panning, or if
+ /* 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 ||
+ if (do_not_and_did_not_need_panning ||
((nouts == outputs.size()) && (npans == _streampanners.size()))) {
return;
- }
+ }
n = _streampanners.size();
clear_panners ();
if (nouts < 2) {
/* no need for panning with less than 2 outputs */
- goto send_changed;
+ if (changed) {
+ Changed (); /* EMIT SIGNAL */
+ }
+ return;
}
switch (nouts) {
case 2: // line
outputs.push_back (Output (0, 0));
outputs.push_back (Output (1.0, 0));
-
for (n = 0; n < npans; ++n) {
_streampanners.push_back (new EqualPowerStereoPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
}
- break;
-
- case 3: // triangle
- outputs.push_back (Output (0.5, 0));
- outputs.push_back (Output (0, 1.0));
- outputs.push_back (Output (1.0, 1.0));
-
- for (n = 0; n < npans; ++n) {
- _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
- }
-
- break;
-
- case 4: // square
- outputs.push_back (Output (0, 0));
- outputs.push_back (Output (1.0, 0));
- outputs.push_back (Output (1.0, 1.0));
- outputs.push_back (Output (0, 1.0));
-
- for (n = 0; n < npans; ++n) {
- _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
- }
-
- break;
-
- case 5: //square+offcenter center
- outputs.push_back (Output (0, 0));
- outputs.push_back (Output (1.0, 0));
- outputs.push_back (Output (1.0, 1.0));
- outputs.push_back (Output (0, 1.0));
- outputs.push_back (Output (0.5, 0.75));
-
- for (n = 0; n < npans; ++n) {
- _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
- }
-
- break;
-
- default:
- /* XXX horrible placement. FIXME */
- for (n = 0; n < nouts; ++n) {
- outputs.push_back (Output (0.1 * n, 0.1 * n));
- }
+ break;
+ case 3:
+ case 4:
+ case 5:
+ default:
+ setup_speakers (nouts);
for (n = 0; n < npans; ++n) {
- _streampanners.push_back (new Multi2dPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
+ _streampanners.push_back (new VBAPanner (*this, Evoral::Parameter(PanAutomation, 0, n), _session.get_speakers()));
}
-
break;
}
(*x)->update ();
}
- /* force hard left/right panning in a common case: 2in/2out
+ /* must emit Changed here, otherwise the changes to the pan_control below raise further
+ signals which the GUI is not prepared for until it has seen the Changed here.
*/
+ if (changed) {
+ Changed (); /* EMIT SIGNAL */
+ }
+
+ /* force hard left/right panning in a common case: 2in/2out
+ */
+
if (npans == 2 && outputs.size() == 2) {
/* Do this only if we changed configuration, or our configuration
_streampanners.back()->get_position (right);
if (changed || ((left == 0.5) && (right == 0.5))) {
-
+
_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);
-
- changed = true;
}
}
-
- send_changed:
- if (changed) {
- Changed (); /* EMIT SIGNAL */
- }
-
- return;
}
void
((AutomationList*)(*i)->pan_control()->list().get())->set_automation_style (style);
}
_session.set_dirty ();
-}
+}
void
Panner::set_automation_state (AutoState state)
((AutomationList*)(*i)->pan_control()->list().get())->set_automation_state (state);
}
_session.set_dirty ();
-}
+}
AutoState
Panner::automation_state () const
XMLNode&
Panner::state (bool full)
{
- XMLNode& node = Processor::state(full);
-
- node.add_property ("type", "panner");
+ XMLNode* node = new XMLNode ("Panner");
char buf[32];
- 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"));
+ 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<Panner::Output>::iterator o = outputs.begin(); o != outputs.end(); ++o) {
XMLNode* onode = new XMLNode (X_("Output"));
onode->add_property (X_("x"), buf);
snprintf (buf, sizeof (buf), "%.12g", (*o).y);
onode->add_property (X_("y"), buf);
- node.add_child_nocopy (*onode);
+ node->add_child_nocopy (*onode);
}
for (vector<StreamPanner*>::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
- node.add_child_nocopy ((*i)->state (full));
+ node->add_child_nocopy ((*i)->state (full));
}
+ node->add_child_nocopy (get_automation_xml_state ());
- return node;
+ return *node;
}
int
-Panner::set_state (const XMLNode& node)
+Panner::set_state (const XMLNode& node, int version)
{
XMLNodeList nlist;
XMLNodeConstIterator niter;
clear_panners ();
- Processor::set_state(node);
-
ChanCount ins = ChanCount::ZERO;
ChanCount outs = ChanCount::ZERO;
outputs.clear ();
if ((prop = node.property (X_("linked"))) != 0) {
- set_linked (prop->value() == "yes");
+ set_linked (string_is_affirmative (prop->value()));
}
if ((prop = node.property (X_("bypassed"))) != 0) {
- set_bypassed (prop->value() == "yes");
+ set_bypassed (string_is_affirmative (prop->value()));
}
-
+
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)));
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->name() == X_("Output")) {
-
+
float x, y;
-
+
prop = (*niter)->property (X_("x"));
sscanf (prop->value().c_str(), "%g", &x);
-
+
prop = (*niter)->property (X_("y"));
sscanf (prop->value().c_str(), "%g", &y);
-
+
outputs.push_back (Output (x, y));
}
}
for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
if ((*niter)->name() == X_("StreamPanner")) {
-
+
if ((prop = (*niter)->property (X_("type")))) {
-
+
for (i = 0; pan_plugins[i].factory; ++i) {
if (prop->value() == pan_plugins[i].name) {
-
-
+
+
/* note that we assume that all the stream panners
are of the same type. pretty good
assumption, but it's still an assumption.
*/
-
+
sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, num_panners));
num_panners++;
-
- if (sp->set_state (**niter) == 0) {
+
+ if (sp->set_state (**niter, version) == 0) {
_streampanners.push_back (sp);
}
-
+
break;
}
}
-
-
+
+
if (!pan_plugins[i].factory) {
error << string_compose (_("Unknown panner plugin \"%1\" found in pan state - ignored"),
prop->value())
return -1;
}
- }
+ }
}
reset (outputs.size (), num_panners);
if ((prop = node.property (X_("automation")))) {
/* automation path is relative */
-
+
automation_path = Glib::build_filename(_session.automation_dir(), prop->value ());
- }
+ }
+ for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+ if ((*niter)->name() == X_("Automation")) {
+ set_automation_xml_state (**niter, Evoral::Parameter (PanAutomation));
+ }
+ }
+
return 0;
}
orig.get_position (xnow);
xdelta = xpos - xnow;
-
+
if (_link_direction == SameDirection) {
for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
orig.get_position (xnow, ynow);
xdelta = xpos - xnow;
ydelta = ypos - ynow;
-
+
if (_link_direction == SameDirection) {
for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
(*i)->set_position (xpos, ypos, true);
} else {
(*i)->get_position (xnow, ynow);
-
+
xnew = min (1.0f, xnow - xdelta);
xnew = max (0.0f, xnew);
(*i)->set_position (xpos, ypos, zpos, true);
} else {
(*i)->get_position (xnow, ynow, znow);
-
+
xnew = min (1.0f, xnow + xdelta);
xnew = max (0.0f, xnew);
assert(!bypassed());
assert(!empty());
-
+
if (outbufs.count().n_audio() == 1) {
AudioBuffer& dst = outbufs.get_audio(0);
/* only one output, and gain was zero, so make it silent */
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);
-
+
// accumulate starting with the second
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);
+ dst.merge_from(*i, nframes);
}
}
// copy the first
dst.read_from(inbufs.get_audio(0), nframes);
-
+
// accumulate (with gain) starting with the second
if (inbufs.count().n_audio() > 0) {
BufferSet::audio_iterator i = inbufs.audio_begin();
return;
}
-
+
/* the terrible silence ... */
for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) {
i->silence(nframes);
}
void
-Panner::run_out_of_place (BufferSet& inbufs, BufferSet& outbufs, nframes_t start_frame, nframes_t end_frame, nframes_t nframes)
-{
+Panner::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes)
+{
if (outbufs.count().n_audio() == 0) {
// Failing to deliver audio we were asked to deliver is a bug
assert(inbufs.count().n_audio() == 0);
assert(!empty());
// If we shouldn't play automation defer to distribute_no_automation
- if ( !( automation_state() & Play ||
- ((automation_state() & Touch) && !touching()) ) ) {
+ if (!(automation_state() & Play || ((automation_state() & Touch) && !touching()))) {
// Speed quietning
gain_t gain_coeff = 1.0;
- if (fabsf(_session.transport_speed()) > 1.5f) {
+
+ if (fabsf(_session.transport_speed()) > 1.5f && Config->get_quieten_at_speed ()) {
gain_coeff = speed_quietning;
}
- distribute_no_automation(inbufs, outbufs, nframes, gain_coeff);
+ distribute_no_automation (inbufs, outbufs, nframes, gain_coeff);
return;
}
// Otherwise.. let the automation flow, baby
-
+
if (outbufs.count().n_audio() == 1) {
AudioBuffer& dst = outbufs.get_audio(0);
// accumulate starting with the second
BufferSet::audio_iterator i = inbufs.audio_begin();
for (++i; i != inbufs.audio_end(); ++i) {
- dst.accumulate_from(*i, nframes);
+ dst.merge_from(*i, nframes);
}
return;
// More than 1 output, we should have 1 panner for each input
//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);
void
Panner::set_name (string str)
{
- automation_path = Glib::build_filename(_session.automation_dir(),
+ automation_path = Glib::build_filename(_session.automation_dir(),
_session.snap_name() + "-pan-" + legalize_for_path (str) + ".automation");
}
*/
if (automation_path.length() == 0) {
return 0;
}
-
+
if (access (automation_path.c_str(), F_OK)) {
return 0;
}
return -1;
}
} else {
- error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"),
+ error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"),
automation_path, line) << endmsg;
return -1;
}
}
if (strcmp (line, "begin") == 0) {
-
+
if (sp == _streampanners.end()) {
error << string_compose (_("too many panner states found in pan automation file %1"),
automation_path)
if ((*sp)->load (in, automation_path, linecnt)) {
return -1;
}
-
+
++sp;
}
}
return 0;
}
+
+void
+Panner::set_mono (bool yn)
+{
+ if (yn != _mono) {
+ _mono = yn;
+ StateChanged ();
+ }
+
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+ (*i)->set_mono (yn);
+ }
+}
+
+string
+Panner::value_as_string (double v)
+{
+ if (Panner::equivalent (v, 0.5)) {
+ return _("C");
+ } else if (equivalent (v, 0)) {
+ return _("L");
+ } else if (equivalent (v, 1)) {
+ return _("R");
+ } else if (v < 0.5) {
+ stringstream s;
+ s << fixed << setprecision (0) << _("L") << ((0.5 - v) * 200) << "%";
+ return s.str();
+ } else {
+ stringstream s;
+ s << fixed << setprecision (0) << _("R") << ((v -0.5) * 200) << "%";
+ return s.str ();
+ }
+
+ return "";
+}
+
+void
+Panner::setup_speakers (uint32_t nouts)
+{
+ switch (nouts) {
+ case 3:
+ outputs.push_back (Output (0.5, 0));
+ outputs.push_back (Output (0, 1.0));
+ outputs.push_back (Output (1.0, 1.0));
+ break;
+ case 4:
+ outputs.push_back (Output (0, 0));
+ outputs.push_back (Output (1.0, 0));
+ outputs.push_back (Output (1.0, 1.0));
+ outputs.push_back (Output (0, 1.0));
+ break;
+
+ case 5: //square+offcenter center
+ outputs.push_back (Output (0, 0));
+ outputs.push_back (Output (1.0, 0));
+ outputs.push_back (Output (1.0, 1.0));
+ outputs.push_back (Output (0, 1.0));
+ outputs.push_back (Output (0.5, 0.75));
+ break;
+
+ default:
+ /* XXX horrible placement. FIXME */
+ for (uint32_t n = 0; n < nouts; ++n) {
+ outputs.push_back (Output (0.1 * n, 0.1 * n));
+ }
+ }
+
+ VBAPSpeakers& speakers (_session.get_speakers());
+
+ speakers.clear_speakers ();
+
+ for (vector<Output>::iterator o = outputs.begin(); o != outputs.end(); ++o) {
+ double azimuth;
+ double elevation;
+
+ cart_to_azi_ele ((*o).x + 1.0, (*o).y + 1.0, (*o).z, azimuth, elevation);
+ speakers.add_speaker (azimuth, elevation);
+ }
+}
projects / ardour.git / blobdiff