/*
- 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
along with this program; if not, write to the Free Software
Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
- $Id$
*/
+#include <inttypes.h>
+
#include <cmath>
#include <cerrno>
#include <fstream>
#include <locale.h>
#include <unistd.h>
#include <float.h>
+#include <iomanip>
#include <glibmm.h>
-#include <pbd/error.h>
-#include <pbd/failed_constructor.h>
-#include <pbd/xml++.h>
+#include "pbd/cartesian.h"
+#include "pbd/error.h"
+#include "pbd/failed_constructor.h"
+#include "pbd/xml++.h"
+#include "pbd/enumwriter.h"
+
+#include "evoral/Curve.hpp"
-#include <ardour/session.h>
-#include <ardour/panner.h>
-#include <ardour/utils.h>
+#include "ardour/session.h"
+#include "ardour/panner.h"
+#include "ardour/utils.h"
+#include "ardour/audio_buffer.h"
-#include <ardour/mix.h>
+#include "ardour/runtime_functions.h"
+#include "ardour/buffer_set.h"
+#include "ardour/audio_buffer.h"
+#include "ardour/vbap.h"
#include "i18n.h"
-#include <pbd/mathfix.h>
+#include "pbd/mathfix.h"
using namespace std;
using namespace ARDOUR;
string EqualPowerStereoPanner::name = "Equal Power Stereo";
string Multi2dPanner::name = "Multiple (2D)";
-/* this is a default mapper of MIDI control values to a pan position
- others can be imagined. see Panner::set_midi_to_pan_function().
+/* this is a default mapper of control values to a pan position
+ others can be imagined.
*/
-static pan_t direct_midi_to_pan (double fract) {
+static pan_t direct_control_to_pan (double fract)
+{
return fract;
}
-static double direct_pan_to_midi (pan_t val) {
- return val;
-}
-
-StreamPanner::StreamPanner (Panner& p)
- : parent (p),
- _midi_control (*this, (MIDI::Port*) 0)
+StreamPanner::StreamPanner (Panner& p, Evoral::Parameter param)
+ : parent (p)
{
+ assert (param.type() != NullAutomation);
+
_muted = false;
+ _mono = false;
- 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));
-StreamPanner::~StreamPanner ()
-{
+ _x = 0.5;
+ _y = 0.5;
+ _z = 0.5;
}
-StreamPanner::MIDIControl::MIDIControl (StreamPanner& s, MIDI::Port* port)
- : MIDI::Controllable (port, 0), sp (s), setting(false)
+StreamPanner::~StreamPanner ()
{
- midi_to_pan = direct_midi_to_pan;
- pan_to_midi = direct_pan_to_midi;
- last_written = 0; /* XXX need a good out-of-bound-value */
}
void
-StreamPanner::MIDIControl::set_value (float val)
+StreamPanner::set_mono (bool yn)
{
- setting = true;
- sp.set_position (midi_to_pan (val));
- setting = false;
-}
-
-void
-StreamPanner::MIDIControl::send_feedback (pan_t value)
-{
-
- if (!setting && get_midi_feedback() && pan_to_midi) {
- MIDI::byte val = (MIDI::byte) (pan_to_midi (value) * 127.0f);
- MIDI::channel_t ch = 0;
- MIDI::eventType ev = MIDI::none;
- MIDI::byte additional = 0;
- MIDI::EventTwoBytes data;
-
- if (get_control_info (ch, ev, additional)) {
- data.controller_number = additional;
- data.value = val;
- last_written = val;
-
- sp.get_parent().session().send_midi_message (get_port(), ev, ch, data);
- }
-
- // send_midi_feedback (pan_to_midi (val));
+ if (yn != _mono) {
+ _mono = yn;
+ StateChanged ();
}
-
}
-MIDI::byte*
-StreamPanner::MIDIControl::write_feedback (MIDI::byte* buf, int32_t& bufsize, pan_t val, bool force)
+void
+Panner::PanControllable::set_value (double val)
{
- if (get_midi_feedback() && pan_to_midi && bufsize > 2) {
- MIDI::channel_t ch = 0;
- MIDI::eventType ev = MIDI::none;
- MIDI::byte additional = 0;
- MIDI::byte pm;
- if (get_control_info (ch, ev, additional)) {
-
- pm = (MIDI::byte) (pan_to_midi (val) * 127.0);
-
- if (pm != last_written || force) {
- *buf++ = (0xF0 & ev) | (0xF & ch);
- *buf++ = additional; /* controller number */
- *buf++ = pm;
- last_written = pm;
- bufsize -= 3;
- }
- }
- }
-
- return buf;
+ panner.streampanner (parameter().id()).set_position (direct_control_to_pan (val));
+ AutomationControl::set_value(val);
}
-
-void
-StreamPanner::reset_midi_control (MIDI::Port* port, bool on)
+double
+Panner::PanControllable::get_value (void) const
{
- MIDI::channel_t chn;
- MIDI::eventType ev;
- MIDI::byte extra;
-
- _midi_control.get_control_info (chn, ev, extra);
- if (!on) {
- chn = -1;
- }
- _midi_control.midi_rebind (port, chn);
+ return AutomationControl::get_value();
}
void
parent.set_position (xpos, *this);
}
- if (x != xpos) {
- x = xpos;
+ if (_x != xpos) {
+ _x = xpos;
update ();
Changed ();
-
- if (parent.session().get_midi_feedback()) {
- _midi_control.send_feedback (x);
- }
+ _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;
- XMLNodeList midi_kids;
if ((prop = node.property (X_("muted")))) {
- set_muted (prop->value() == "yes");
+ set_muted (string_is_affirmative (prop->value()));
}
- midi_kids = node.children ("MIDI");
-
- for (iter = midi_kids.begin(); iter != midi_kids.end(); ++iter) {
-
- XMLNodeList kids;
- XMLNodeConstIterator miter;
- XMLNode* child;
-
- kids = (*iter)->children ();
-
- for (miter = kids.begin(); miter != kids.end(); ++miter) {
-
- child =* miter;
-
- if (child->name() == "pan") {
-
- MIDI::eventType ev = MIDI::on; /* initialize to keep gcc happy */
- MIDI::byte additional = 0; /* ditto */
- MIDI::channel_t chn = 0; /* ditto */
-
- if (get_midi_node_info (child, ev, chn, additional)) {
- _midi_control.set_control_type (chn, ev, additional);
- } else {
- error << _("MIDI pan control specification is incomplete, so it has been ignored") << endmsg;
- }
- }
- }
+ 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"));
-
- /* MIDI control */
-
- MIDI::channel_t chn;
- MIDI::eventType ev;
- MIDI::byte additional;
- XMLNode* midi_node = 0;
- XMLNode* child;
-
- if (_midi_control.get_control_info (chn, ev, additional)) {
-
- midi_node = node.add_child ("MIDI");
-
- child = midi_node->add_child ("pan");
- set_midi_node_info (child, ev, chn, additional);
- }
-
+ node.add_property (X_("mono"), (_mono ? "yes" : "no"));
}
-
-bool
-StreamPanner::get_midi_node_info (XMLNode * node, MIDI::eventType & ev, MIDI::channel_t & chan, MIDI::byte & additional)
+void
+StreamPanner::distribute (AudioBuffer& src, BufferSet& obufs, gain_t gain_coeff, nframes_t nframes)
{
- bool ok = true;
- const XMLProperty* prop;
- int xx;
-
- if ((prop = node->property ("event")) != 0) {
- sscanf (prop->value().c_str(), "0x%x", &xx);
- ev = (MIDI::eventType) xx;
+ 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 {
- ok = false;
+ /* normal mode, call the `real' distribute method */
+ do_distribute (src, obufs, gain_coeff, nframes);
}
+}
- if (ok && ((prop = node->property ("channel")) != 0)) {
- sscanf (prop->value().c_str(), "%d", &xx);
- chan = (MIDI::channel_t) xx;
+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 {
- ok = false;
- }
-
- if (ok && ((prop = node->property ("additional")) != 0)) {
- sscanf (prop->value().c_str(), "0x%x", &xx);
- additional = (MIDI::byte) xx;
+ /* normal mode, call the `real' distribute method */
+ do_distribute_automated (src, obufs, start, end, nframes, buffers);
}
-
- return ok;
+
}
-bool
-StreamPanner::set_midi_node_info (XMLNode * node, MIDI::eventType ev, MIDI::channel_t chan, MIDI::byte additional)
-{
- char buf[32];
-
- snprintf (buf, sizeof(buf), "0x%x", ev);
- node->add_property ("event", buf);
- snprintf (buf, sizeof(buf), "%d", chan);
- node->add_property ("channel", buf);
- snprintf (buf, sizeof(buf), "0x%x", additional);
- node->add_property ("additional", buf);
-
- return true;
-}
/*---------------------------------------------------------------------- */
-BaseStereoPanner::BaseStereoPanner (Panner& p)
- : StreamPanner (p), _automation (0.0, 1.0, 0.5)
+BaseStereoPanner::BaseStereoPanner (Panner& p, Evoral::Parameter param)
+ : StreamPanner (p, param)
+ , left (0.5)
+ , right (0.5)
+ , left_interp (left)
+ , right_interp (right)
{
}
{
}
-void
-BaseStereoPanner::snapshot (jack_nframes_t now)
-{
- if (_automation.automation_state() == Write || _automation.automation_state() == Touch) {
- _automation.rt_add (now, x);
- }
-}
-
-void
-BaseStereoPanner::transport_stopped (jack_nframes_t frame)
-{
- _automation.reposition_for_rt_add (frame);
-
- if (_automation.automation_state() != Off) {
-
- if (_automation.automation_write()) {
- _automation.save_state (_("automation write pass"));
- }
-
- 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::save (ostream& out) const
-{
- LocaleGuard lg (X_("POSIX"));
-
- /* force a single format for numeric data to ease session interchange
- across national boundaries.
- */
-
- out << "begin" << endl;
-
- for (AutomationList::const_iterator i = _automation.const_begin(); i != _automation.const_end(); ++i) {
- out << '\t' << (jack_nframes_t) floor ((*i)->when) << ' ' << (*i)->value << endl;
- if (!out) {
- error << string_compose (_("error writing pan automation file (%s)"), strerror (errno)) << endmsg;
- return -1;
- }
- }
- out << "end" << endl;
-
- return 0;
-}
-
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.add (when, value, true);
+ _control->list()->fast_simple_add (when, value);
}
/* now that we are done loading */
- _automation.save_state (_("loaded from disk"));
- _automation.StateChanged (Change (0));
+ ((AutomationList*)_control->list().get())->StateChanged ();
return 0;
}
void
-BaseStereoPanner::distribute (Sample* src, Sample** obufs, gain_t gain_coeff, jack_nframes_t nframes)
+BaseStereoPanner::do_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;
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
- if (fabsf ((delta = (left - desired_left))) > 0.002) { // about 1 degree of arc
-
- /* interpolate over 64 frames or nframes, whichever is smaller */
-
- jack_nframes_t limit = min ((jack_nframes_t)64, nframes);
- jack_nframes_t n;
+ /* 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;
- Session::mix_buffers_with_gain(dst+n,src+n,nframes-n,pan);
-
+ 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) {
-
- Session::mix_buffers_with_gain(dst,src,nframes,pan);
+
+ /* 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 {
-
- Session::mix_buffers_no_gain(dst,src,nframes);
-
+
+ /* 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[1];
-
- if (fabsf ((delta = (right - desired_right))) > 0.002) { // about 1 degree of arc
-
- /* interpolate over 64 frames or nframes, whichever is smaller */
-
- jack_nframes_t limit = min ((jack_nframes_t)64, nframes);
- jack_nframes_t n;
+ dst = obufs.get_audio(1).data();
+
+ 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;
-
- 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 */
} 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" */
- 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 {
+
+ /* pan is 1 so we can just copy the input samples straight in */
- 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 */
}
}
/*---------------------------------------------------------------------- */
-EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p)
- : BaseStereoPanner (p)
+EqualPowerStereoPanner::EqualPowerStereoPanner (Panner& p, Evoral::Parameter param)
+ : BaseStereoPanner (p, param)
{
update ();
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 (Sample* src, Sample** obufs,
- jack_nframes_t start, jack_nframes_t end, jack_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);
+
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);
+ do_distribute (srcbuf, obufs, 1.0, nframes);
}
return;
}
/* store effective pan position. do this even if we are muted */
- if (nframes > 0)
+ if (nframes > 0) {
effective_x = buffers[0][nframes-1];
+ }
if (_muted) {
return;
const float pan_law_attenuation = -3.0f;
const float scale = 2.0f - 4.0f * powf (10.0f,pan_law_attenuation/20.0f);
- for (jack_nframes_t n = 0; n < nframes; ++n) {
+ for (nframes_t n = 0; n < nframes; ++n) {
+
+ float const panR = buffers[0][n];
+ float const panL = 1 - panR;
- float panR = buffers[0][n];
- float panL = 1 - panR;
-
buffers[0][n] = panL * (scale * panL + 1.0f - scale);
buffers[1][n] = panR * (scale * panR + 1.0f - scale);
}
/* LEFT */
- dst = obufs[0];
+ dst = obufs.get_audio(0).data();
pbuf = buffers[0];
-
- for (jack_nframes_t n = 0; n < nframes; ++n) {
+
+ 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 (jack_nframes_t n = 0; n < nframes; ++n) {
+ 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*
-EqualPowerStereoPanner::factory (Panner& parent)
+EqualPowerStereoPanner::factory (Panner& parent, Evoral::Parameter param)
{
- return new EqualPowerStereoPanner (parent);
+ return new EqualPowerStereoPanner (parent, param);
}
XMLNode&
}
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), "%f", x);
+ snprintf (buf, sizeof (buf), "%.12g", _x);
root->add_property (X_("x"), buf);
root->add_property (X_("type"), EqualPowerStereoPanner::name);
- if (full_state) {
- snprintf (buf, sizeof (buf), "0x%x", _automation.automation_state());
- } else {
- /* never store automation states other than off in a template */
- snprintf (buf, sizeof (buf), "0x%x", ARDOUR::Off);
- }
- root->add_property (X_("automation-state"), buf);
- snprintf (buf, sizeof (buf), "0x%x", _automation.automation_style());
- root->add_property (X_("automation-style"), buf);
+
+ // XXX: dont save automation here... its part of the automatable panner now.
StreamPanner::add_state (*root);
+ root->add_child_nocopy (_control->get_state ());
+
return *root;
}
int
-EqualPowerStereoPanner::set_state (const XMLNode& node)
+EqualPowerStereoPanner::set_state (const XMLNode& node, int version)
{
const XMLProperty* prop;
- int x;
- 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);
- }
+ }
- if ((prop = node.property (X_("automation-state")))) {
- sscanf (prop->value().c_str(), "0x%x", &x);
- _automation.set_automation_state ((AutoState) x);
+ StreamPanner::set_state (node, version);
- if (x != Off) {
- set_position (_automation.eval (parent.session().transport_frame()));
- }
- }
+ 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, version);
+ }
+
+ } else if ((*iter)->name() == X_("Automation")) {
- if ((prop = node.property (X_("automation-style")))) {
- sscanf (prop->value().c_str(), "0x%x", &x);
- _automation.set_automation_style ((AutoStyle) x);
+ _control->alist()->set_state (*((*iter)->children().front()), version);
+
+ if (_control->alist()->automation_state() != Off) {
+ set_position (_control->list()->eval (parent.session().transport_frame()));
+ }
+ }
}
- StreamPanner::set_state (node);
-
return 0;
}
/*----------------------------------------------------------------------*/
-Multi2dPanner::Multi2dPanner (Panner& p)
- : StreamPanner (p), _automation (0.0, 1.0, 0.5) // XXX useless
+Multi2dPanner::Multi2dPanner (Panner& p, Evoral::Parameter param)
+ : StreamPanner (p, param)
{
update ();
}
{
}
-void
-Multi2dPanner::snapshot (jack_nframes_t now)
-{
- // how?
-}
-
-void
-Multi2dPanner::transport_stopped (jack_nframes_t frame)
-{
- //what?
-}
-
-void
-Multi2dPanner::set_automation_style (AutoStyle style)
-{
- //what?
-}
-
-void
-Multi2dPanner::set_automation_state (AutoState state)
-{
- // what?
-}
-
void
Multi2dPanner::update ()
{
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 (Sample* src, Sample** obufs, gain_t gain_coeff, jack_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();
- 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();
- dst = obufs[n];
-
#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 */
-
- jack_nframes_t limit = min ((jack_nframes_t)64, nframes);
- jack_nframes_t n;
-
+
+ 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;
-
- for (; n < nframes; ++n) {
- dst[n] += src[n] * pan;
- }
-
+ 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) {
-
- for (jack_nframes_t n = 0; n < nframes; ++n) {
- dst[n] += src[n] * pan;
- }
-
- }
+ if (pan != 0.0f) {
+ mix_buffers_with_gain(dst,src,nframes,pan);
+ }
} else {
-
- for (jack_nframes_t n = 0; n < nframes; ++n) {
- dst[n] += src[n];
- }
-
+ mix_buffers_no_gain(dst,src,nframes);
}
#endif
#ifdef CAN_INTERP
}
#endif
}
-
+
return;
}
void
-Multi2dPanner::distribute_automated (Sample* src, Sample** obufs,
- jack_nframes_t start, jack_nframes_t end, jack_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;
}
StreamPanner*
-Multi2dPanner::factory (Panner& p)
-{
- return new Multi2dPanner (p);
-}
-
-int
-Multi2dPanner::load (istream& in, string path, uint32_t& linecnt)
+Multi2dPanner::factory (Panner& p, Evoral::Parameter param)
{
- return 0;
+ return new Multi2dPanner (p, param);
}
int
-Multi2dPanner::save (ostream& out) const
+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), "%f", x);
+ snprintf (buf, sizeof (buf), "%.12g", _x);
root->add_property (X_("x"), buf);
- snprintf (buf, sizeof (buf), "%f", y);
+ snprintf (buf, sizeof (buf), "%.12g", _y);
root->add_property (X_("y"), buf);
root->add_property (X_("type"), Multi2dPanner::name);
+ /* XXX no meaningful automation yet */
+
return *root;
}
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)
- : _session (s)
+ : SessionObject (s, name)
+ , Automatable (s)
{
+ //set_name_old_auto (name);
set_name (name);
+
_linked = false;
_link_direction = SameDirection;
_bypassed = false;
-
- reset_midi_control (_session.mmc_port(), _session.get_mmc_control());
+ _mono = false;
}
Panner::~Panner ()
}
}
-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";
-}
-
void
Panner::set_bypassed (bool yn)
void
-Panner::reset (uint32_t nouts, uint32_t npans)
+Panner::reset_to_default ()
{
- uint32_t n;
- bool changed = false;
+ vector<float> positions;
-
- if (nouts < 2 || (nouts == outputs.size() && npans == size())) {
+ switch (outputs.size()) {
+ case 0:
+ case 1:
return;
- }
-
- n = size();
- clear ();
+ }
- if (n != npans) {
- changed = true;
+ 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;
+ }
}
- n = outputs.size();
- outputs.clear ();
+ vector<Output>::iterator o;
+ vector<StreamPanner*>::iterator p;
- if (n != nouts) {
- changed = true;
+ for (o = outputs.begin(), p = _streampanners.begin(); o != outputs.end() && p != _streampanners.end(); ++o, ++p) {
+ (*p)->set_position ((*o).x, (*o).y);
}
+}
- switch (nouts) {
- case 0:
- break;
+void
+Panner::reset_streampanner (uint32_t which)
+{
+ if (which >= _streampanners.size() || which >= outputs.size()) {
+ return;
+ }
+ switch (outputs.size()) {
+ case 0:
case 1:
- fatal << _("programming error:")
- << X_("Panner::reset() called with a single output")
- << endmsg;
- /*NOTREACHED*/
- break;
+ return;
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));
+ 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;
}
- break;
+ return;
- 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));
+ default:
+ _streampanners[which]->set_position (outputs[which].x, outputs[which].y);
+ }
+}
- for (n = 0; n < npans; ++n) {
- push_back (new Multi2dPanner (*this));
- }
+/**
+ * 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)
+{
+ uint32_t n;
+ bool changed = false;
+ bool do_not_and_did_not_need_panning = ((nouts < 2) && (outputs.size() < 2));
- break;
+ /* if new and old config don't need panning, or if
+ the config hasn't changed, we're done.
+ */
- 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));
+ if (do_not_and_did_not_need_panning ||
+ ((nouts == outputs.size()) && (npans == _streampanners.size()))) {
+ return;
+ }
- for (n = 0; n < npans; ++n) {
- push_back (new Multi2dPanner (*this));
- }
+ n = _streampanners.size();
+ clear_panners ();
+
+ if (n != npans) {
+ changed = true;
+ }
- break;
+ n = outputs.size();
+ outputs.clear ();
- 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));
+ if (n != nouts) {
+ changed = true;
+ }
- for (n = 0; n < npans; ++n) {
- push_back (new Multi2dPanner (*this));
+ if (nouts < 2) {
+ /* no need for panning with less than 2 outputs */
+ if (changed) {
+ Changed (); /* EMIT SIGNAL */
}
+ return;
+ }
+ switch (nouts) {
+ case 0:
+ /* XXX: this can never happen */
break;
- default:
- /* XXX horrible placement. FIXME */
- for (n = 0; n < nouts; ++n) {
- outputs.push_back (Output (0.1 * n, 0.1 * n));
- }
+ case 1:
+ /* XXX: this can never happen */
+ fatal << _("programming error:")
+ << X_("Panner::reset() called with a single output")
+ << endmsg;
+ /*NOTREACHED*/
+ break;
+ 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 Multi2dPanner (*this));
+ _streampanners.push_back (new EqualPowerStereoPanner (*this, Evoral::Parameter(PanAutomation, 0, n)));
}
+ break;
+ case 3:
+ case 4:
+ case 5:
+ default:
+ setup_speakers (nouts);
+ for (n = 0; n < npans; ++n) {
+ _streampanners.push_back (new VBAPanner (*this, Evoral::Parameter(PanAutomation, 0, n), _session.get_speakers()));
+ }
break;
}
- for (iterator x = begin(); x != end(); ++x) {
+ for (std::vector<StreamPanner*>::iterator x = _streampanners.begin(); x != _streampanners.end(); ++x) {
(*x)->update ();
}
- reset_midi_control (_session.mmc_port(), _session.get_mmc_control());
-
- /* 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
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()->automation().reset_default (0.0);
-
- back()->set_position (1.0);
- back()->automation().reset_default (1.0);
-
- changed = true;
- }
- }
- if (changed) {
- Changed (); /* EMIT SIGNAL */
- }
+ _streampanners.front()->set_position (0.0);
+ _streampanners.front()->pan_control()->list()->reset_default (0.0);
- return;
+ _streampanners.back()->set_position (1.0);
+ _streampanners.back()->pan_control()->list()->reset_default (1.0);
+ }
+ }
}
void
Panner::remove (uint32_t which)
{
vector<StreamPanner*>::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<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
delete *i;
}
- vector<StreamPanner*>::clear ();
+ _streampanners.clear ();
}
void
Panner::set_automation_style (AutoStyle style)
{
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->set_automation_style (style);
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+ ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_style (style);
}
_session.set_dirty ();
-}
+}
void
Panner::set_automation_state (AutoState state)
{
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->set_automation_state (state);
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+ ((AutomationList*)(*i)->pan_control()->list().get())->set_automation_state (state);
}
_session.set_dirty ();
-}
+}
AutoState
Panner::automation_state () const
{
+ boost::shared_ptr<AutomationList> l;
if (!empty()) {
- return front()->automation().automation_state ();
- } else {
- return Off;
+ boost::shared_ptr<AutomationControl> control = _streampanners.front()->pan_control();
+ if (control) {
+ l = boost::dynamic_pointer_cast<AutomationList>(control->list());
+ }
}
+
+ return l ? l->automation_state() : Off;
}
AutoStyle
Panner::automation_style () const
{
+ boost::shared_ptr<AutomationList> l;
if (!empty()) {
- return front()->automation().automation_style ();
- } else {
- return Absolute;
- }
-}
-
-void
-Panner::transport_stopped (jack_nframes_t frame)
-{
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->transport_stopped (frame);
- }
-}
-
-void
-Panner::snapshot (jack_nframes_t now)
-{
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->snapshot (now);
- }
-}
-
-void
-Panner::clear_automation ()
-{
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->automation().clear ();
- }
- _session.set_dirty ();
-}
-
-int
-Panner::save () const
-{
- ofstream out (automation_path.c_str());
-
- if (!out) {
- error << string_compose (_("cannot open pan automation file \"%1\" for saving (%s)"), automation_path, strerror (errno))
- << endmsg;
- return -1;
- }
-
- out << X_("version ") << current_automation_version_number << endl;
-
- for (vector<StreamPanner*>::const_iterator i = begin(); i != end(); ++i) {
- if ((*i)->save (out)) {
- return -1;
+ boost::shared_ptr<AutomationControl> control = _streampanners.front()->pan_control();
+ if (control) {
+ l = boost::dynamic_pointer_cast<AutomationList>(control->list());
}
}
- return 0;
-}
-
-int
-Panner::load ()
-{
- char line[128];
- uint32_t linecnt = 0;
- float version;
- iterator sp;
- LocaleGuard lg (X_("POSIX"));
-
- if (automation_path.length() == 0) {
- return 0;
- }
-
- if (access (automation_path.c_str(), F_OK)) {
- return 0;
- }
-
- ifstream in (automation_path.c_str());
-
- if (!in) {
- error << string_compose (_("cannot open pan automation file %1 (%2)"),
- automation_path, strerror (errno))
- << endmsg;
- return -1;
- }
-
- sp = begin();
-
- while (in.getline (line, sizeof(line), '\n')) {
-
- if (++linecnt == 1) {
- if (memcmp (line, X_("version"), 7) == 0) {
- if (sscanf (line, "version %f", &version) != 1) {
- error << string_compose(_("badly formed version number in pan automation event file \"%1\""), automation_path) << endmsg;
- return -1;
- }
- } else {
- error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"),
- automation_path, line) << endmsg;
- return -1;
- }
-
- if (version != current_automation_version_number) {
- error << string_compose(_("mismatched pan automation event file version (%1)"), version) << endmsg;
- return -1;
- }
-
- continue;
- }
-
- if (strlen (line) == 0 || line[0] == '#') {
- continue;
- }
-
- if (strcmp (line, "begin") == 0) {
-
- if (sp == end()) {
- error << string_compose (_("too many panner states found in pan automation file %1"),
- automation_path)
- << endmsg;
- return -1;
- }
-
- if ((*sp)->load (in, automation_path, linecnt)) {
- return -1;
- }
-
- ++sp;
- }
- }
-
- return 0;
+ return l ? l->automation_style() : Absolute;
}
struct PanPlugins {
string name;
uint32_t nouts;
- StreamPanner* (*factory)(Panner&);
+ StreamPanner* (*factory)(Panner&, Evoral::Parameter);
};
PanPlugins pan_plugins[] = {
{ EqualPowerStereoPanner::name, 2, EqualPowerStereoPanner::factory },
{ Multi2dPanner::name, 3, Multi2dPanner::factory },
- { string (""), 0 }
+ { string (""), 0, 0 }
};
XMLNode&
XMLNode&
Panner::state (bool full)
{
- XMLNode* root = new XMLNode (X_("Panner"));
- char buf[32];
+ XMLNode* node = new XMLNode ("Panner");
- for (iterator p = begin(); p != end(); ++p) {
- root->add_child_nocopy ((*p)->state (full));
- }
-
- root->add_property (X_("linked"), (_linked ? "yes" : "no"));
- snprintf (buf, sizeof (buf), "%d", _link_direction);
- root->add_property (X_("link_direction"), buf);
- 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<Panner::Output>::iterator o = outputs.begin(); o != outputs.end(); ++o) {
XMLNode* onode = new XMLNode (X_("Output"));
- snprintf (buf, sizeof (buf), "%f", (*o).x);
+ snprintf (buf, sizeof (buf), "%.12g", (*o).x);
onode->add_property (X_("x"), buf);
- snprintf (buf, sizeof (buf), "%f", (*o).y);
+ snprintf (buf, sizeof (buf), "%.12g", (*o).y);
onode->add_property (X_("y"), buf);
- root->add_child_nocopy (*onode);
+ node->add_child_nocopy (*onode);
}
- if (full) {
- if (save () == 0) {
- root->add_property (X_("automation"), Glib::path_get_basename (automation_path));
- }
+ for (vector<StreamPanner*>::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+ node->add_child_nocopy ((*i)->state (full));
}
- return *root;
+ node->add_child_nocopy (get_automation_xml_state ());
+
+ return *node;
}
int
-Panner::set_state (const XMLNode& node)
+Panner::set_state (const XMLNode& node, int version)
{
XMLNodeList nlist;
XMLNodeConstIterator niter;
const XMLProperty *prop;
uint32_t i;
+ uint32_t num_panners = 0;
StreamPanner* sp;
LocaleGuard lg (X_("POSIX"));
- clear ();
+ clear_panners ();
+
+ ChanCount ins = ChanCount::ZERO;
+ ChanCount outs = ChanCount::ZERO;
+
+ // XXX: this might not be necessary anymore
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) {
- sscanf (prop->value().c_str(), "%d", &i);
- set_link_direction ((LinkDirection) (i));
+ LinkDirection ld; /* here to provide type information */
+ set_link_direction (LinkDirection (string_2_enum (prop->value(), ld)));
}
nlist = node.children();
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(), "%f", &x);
-
+ sscanf (prop->value().c_str(), "%g", &x);
+
prop = (*niter)->property (X_("y"));
- sscanf (prop->value().c_str(), "%f", &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 its still an assumption.
+ assumption, but it's still an assumption.
*/
-
- sp = pan_plugins[i].factory (*this);
-
- if (sp->set_state (**niter) == 0) {
- push_back (sp);
+
+ sp = pan_plugins[i].factory (*this, Evoral::Parameter(PanAutomation, 0, num_panners));
+ num_panners++;
+
+ 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;
}
- }
+ }
}
- /* don't try to load automation if it wasn't marked as existing */
+ 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 ());
+ }
+
+ for (niter = nlist.begin(); niter != nlist.end(); ++niter) {
+ if ((*niter)->name() == X_("Automation")) {
+ set_automation_xml_state (**niter, Evoral::Parameter (PanAutomation));
+ }
+ }
+
return 0;
}
-
-
bool
Panner::touching () const
{
- for (vector<StreamPanner*>::const_iterator i = begin(); i != end(); ++i) {
- if ((*i)->automation().touching ()) {
+ for (vector<StreamPanner*>::const_iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
+ if (((AutomationList*)(*i)->pan_control()->list().get())->touching ()) {
return true;
}
}
return false;
}
-void
-Panner::reset_midi_control (MIDI::Port* port, bool on)
-{
- for (vector<StreamPanner*>::const_iterator i = begin(); i != end(); ++i) {
- (*i)->reset_midi_control (port, on);
- }
-}
-
void
Panner::set_position (float xpos, StreamPanner& orig)
{
orig.get_position (xnow);
xdelta = xpos - xnow;
-
+
if (_link_direction == SameDirection) {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*i)->set_position (xpos, true);
} else {
} else {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*i)->set_position (xpos, true);
} else {
orig.get_position (xnow, ynow);
xdelta = xpos - xnow;
ydelta = ypos - ynow;
-
+
if (_link_direction == SameDirection) {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*i)->set_position (xpos, ypos, true);
} else {
} else {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*i)->set_position (xpos, ypos, true);
} else {
(*i)->get_position (xnow, ynow);
-
+
xnew = min (1.0f, xnow - xdelta);
xnew = max (0.0f, xnew);
if (_link_direction == SameDirection) {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*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);
} else {
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
+ for (vector<StreamPanner*>::iterator i = _streampanners.begin(); i != _streampanners.end(); ++i) {
if (*i == &orig) {
(*i)->set_position (xpos, ypos, true);
} else {
}
void
-Panner::send_all_midi_feedback ()
+Panner::distribute_no_automation (BufferSet& inbufs, BufferSet& outbufs, nframes_t nframes, gain_t gain_coeff)
{
- if (_session.get_midi_feedback()) {
- float xpos;
-
- // do feedback for all panners
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->get_effective_position (xpos);
+ 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 (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.merge_from(*i, nframes);
+ }
+ }
+
+ } else {
+
+ /* mix all buffers into the output, scaling them all by the gain */
+
+ // 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();
+ for (++i; i != inbufs.audio_end(); ++i) {
+ dst.accumulate_with_gain_from(*i, nframes, gain_coeff);
+ }
+ }
- (*i)->midi_control().send_feedback (xpos);
}
-
+
+ return;
+ }
+
+ /* the terrible silence ... */
+ for (BufferSet::audio_iterator i = outbufs.audio_begin(); i != outbufs.audio_end(); ++i) {
+ i->silence(nframes);
+ }
+
+ BufferSet::audio_iterator i = inbufs.audio_begin();
+
+ for (vector<StreamPanner*>::iterator pan = _streampanners.begin(); pan != _streampanners.end() && i != inbufs.audio_end(); ++pan, ++i) {
+ (*pan)->distribute (*i, outbufs, gain_coeff, nframes);
}
}
-MIDI::byte*
-Panner::write_midi_feedback (MIDI::byte* buf, int32_t& bufsize)
+void
+Panner::run (BufferSet& inbufs, BufferSet& outbufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes)
{
- AutoState astate = automation_state ();
+ 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;
+ }
- if (_session.get_midi_feedback() &&
- (astate == Play || (astate == Touch && !touching()))) {
-
- float xpos;
-
- // do feedback for all panners
- for (vector<StreamPanner*>::iterator i = begin(); i != end(); ++i) {
- (*i)->get_effective_position (xpos);
-
- buf = (*i)->midi_control().write_feedback (buf, bufsize, xpos);
+ // 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 && Config->get_quieten_at_speed ()) {
+ gain_coeff = speed_quietning;
}
-
+
+ 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);
+
+ // FIXME: apply gain automation?
+
+ // copy the first
+ 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.merge_from(*i, nframes);
+ }
+
+ return;
}
- return buf;
+ // 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);
+ }
+
+ BufferSet::audio_iterator i = inbufs.audio_begin();
+ for (vector<StreamPanner*>::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 = Glib::build_filename(_session.automation_dir(),
+ _session.snap_name() + "-pan-" + legalize_for_path (str) + ".automation");
+}
+*/
+
+int
+Panner::load ()
+{
+ char line[128];
+ uint32_t linecnt = 0;
+ float version;
+ vector<StreamPanner*>::iterator sp;
+ LocaleGuard lg (X_("POSIX"));
+
+ if (automation_path.length() == 0) {
+ return 0;
+ }
+
+ if (access (automation_path.c_str(), F_OK)) {
+ return 0;
+ }
+
+ ifstream in (automation_path.c_str());
+
+ if (!in) {
+ error << string_compose (_("cannot open pan automation file %1 (%2)"),
+ automation_path, strerror (errno))
+ << endmsg;
+ return -1;
+ }
+
+ sp = _streampanners.begin();
+
+ while (in.getline (line, sizeof(line), '\n')) {
+
+ if (++linecnt == 1) {
+ if (memcmp (line, X_("version"), 7) == 0) {
+ if (sscanf (line, "version %f", &version) != 1) {
+ error << string_compose(_("badly formed version number in pan automation event file \"%1\""), automation_path) << endmsg;
+ return -1;
+ }
+ } else {
+ error << string_compose(_("no version information in pan automation event file \"%1\" (first line = %2)"),
+ automation_path, line) << endmsg;
+ return -1;
+ }
+
+ continue;
+ }
+
+ if (strlen (line) == 0 || line[0] == '#') {
+ continue;
+ }
+
+ if (strcmp (line, "begin") == 0) {
+
+ if (sp == _streampanners.end()) {
+ error << string_compose (_("too many panner states found in pan automation file %1"),
+ automation_path)
+ << endmsg;
+ return -1;
+ }
+
+ 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