#include <algorithm>
#include "pbd/enumwriter.h"
-#include "pbd/convert.h"
+#include "pbd/enum_convert.h"
#include "ardour/amp.h"
#include "ardour/audioengine.h"
#include "ardour/port.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
+
+namespace PBD {
+ DEFINE_ENUM_CONVERT(ARDOUR::Delivery::Role);
+}
namespace ARDOUR { class Panner; }
: IOProcessor(s, boost::shared_ptr<IO>(), (role_requires_output_ports (r) ? io : boost::shared_ptr<IO>()), name)
, _role (r)
, _output_buffers (new BufferSet())
- , _amp (new Amp (s))
+ , _current_gain (GAIN_COEFF_UNITY)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
if (_output) {
_output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2));
}
-
- _amp->activate ();
}
/* deliver to a new IO object */
: IOProcessor(s, false, (role_requires_output_ports (r) ? true : false), name, "", DataType::AUDIO, (r == Send))
, _role (r)
, _output_buffers (new BufferSet())
- , _amp (new Amp (s))
+ , _current_gain (GAIN_COEFF_UNITY)
, _no_outs_cuz_we_no_monitor (false)
, _mute_master (mm)
, _no_panner_reset (false)
if (_output) {
_output->changed.connect_same_thread (*this, boost::bind (&Delivery::output_changed, this, _1, _2));
}
-
- _amp->activate ();
}
+
Delivery::~Delivery()
{
DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
}
void
-Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required)
+Delivery::run (BufferSet& bufs, samplepos_t start_sample, samplepos_t end_sample, double /*speed*/, pframes_t nframes, bool result_required)
{
assert (_output);
PortSet& ports (_output->ports());
gain_t tgain;
- bool need_amp = true;
- if (_output->n_ports ().get (_output->default_type()) == 0) {
+ if (ports.num_ports () == 0) {
goto out;
}
}
/* this setup is not just for our purposes, but for anything that comes after us in the
- processing pathway that wants to use this->output_buffers() for some reason.
- */
+ * processing pathway that wants to use this->output_buffers() for some reason.
+ */
// TODO delayline -- latency-compensation
output_buffers().get_backend_port_addresses (ports, nframes);
tgain = target_gain ();
- if (tgain < GAIN_COEFF_SMALL && _amp->gain() < GAIN_COEFF_SMALL) {
-
- /* special case (but very common) fast path:
- *
- * if we are supposed to be silent, and we were already silent,
- * then short-circuit the computation in Amp and just put silence into
- * our output(s)
- */
-
- _output->silence (nframes);
-
- if (!result_required) {
- /* if !result_required, then the buffers won't actually
- * be used. This means we don't actually need to silence
- * them, because we've already filled the output ports
- * with silence.
- *
- * but we just noted that result_required is true,
- * and so we do need to run the amp to ensure
- * that the buffers are silenced.
- */
- need_amp = false;
- }
- }
-
- if (need_amp) {
+ if (tgain != _current_gain) {
+ /* target gain has changed */
- bufs.set_count (output_buffers().count ());
+ _current_gain = Amp::apply_gain (bufs, _session.nominal_sample_rate(), nframes, _current_gain, tgain);
- if (_role != Main) {
+ } else if (tgain < GAIN_COEFF_SMALL) {
- /* inserts, external and internal sends have
- * automatable gain and the Amp::run() method has
- * already been executed by the time we get here.
- *
- * XXX we do not expose the automatable gain for
- * Inserts as of September 2015.
+ /* we were quiet last time, and we're still supposed to be quiet.
+ Silence the outputs, and make sure the buffers are quiet too,
*/
- } else {
-
- /* main outs have no automatable gain, the amp is just
- * used for ramping gain changes caused by monitoring
- * state changes.
- */
-
- _amp->set_gain (tgain, this);
- _amp->run (bufs, 0, 0, nframes, false);
-
+ _output->silence (nframes);
+ if (result_required) {
+ bufs.set_count (output_buffers().count ());
+ Amp::apply_simple_gain (bufs, nframes, GAIN_COEFF_ZERO);
}
-
- } else {
goto out;
+
+ } else if (tgain != GAIN_COEFF_UNITY) {
+
+ /* target gain has not changed, but is not unity */
+ Amp::apply_simple_gain (bufs, nframes, tgain);
}
- // Speed quietning
+ // Speed quietning
if (fabs (_session.transport_speed()) > 1.5 && Config->get_quieten_at_speed ()) {
Amp::apply_simple_gain (bufs, nframes, speed_quietning, false);
// Use the panner to distribute audio to output port buffers
- _panshell->run (bufs, output_buffers(), start_frame, end_frame, nframes);
+ _panshell->run (bufs, output_buffers(), start_sample, end_sample, nframes);
- // MIDI data will not have been delivered by the panner
+ // non-audio data will not have been delivered by the panner
- if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
- _output->copy_to_outputs (bufs, DataType::MIDI, nframes, 0);
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+ _output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+ }
}
} else {
- // Do a 1:1 copy of data to output ports
+ /* Do a 1:1 copy of data to output ports
- if (bufs.count().n_audio() > 0 && ports.count().n_audio () > 0) {
+ Audio is handled separately because we use 0 for the offset,
+ since the port offset is only used for timestamped events
+ (i.e. MIDI).
+ */
+
+ if (bufs.count().n_audio() > 0) {
_output->copy_to_outputs (bufs, DataType::AUDIO, nframes, 0);
- }
+ }
- if (bufs.count().n_midi() > 0 && ports.count().n_midi () > 0) {
- _output->copy_to_outputs (bufs, DataType::MIDI, nframes, 0);
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
+ if (*t != DataType::AUDIO && bufs.count().get(*t) > 0) {
+ _output->copy_to_outputs (bufs, *t, nframes, Port::port_offset());
+ }
}
}
- if (result_required) {
- bufs.read_from (output_buffers (), nframes);
- }
+ if (result_required) {
+ /* "bufs" are internal, meaning they should never reflect
+ split-cycle offsets. So shift events back in time from where
+ they were for the external buffers associated with Ports.
+ */
+
+ const BufferSet& outs (output_buffers());
+ bufs.set_count (output_buffers().count ());
+
+ for (DataType::iterator t = DataType::begin(); t != DataType::end(); ++t) {
- out:
+ uint32_t n = 0;
+ for (BufferSet::iterator b = bufs.begin (*t); b != bufs.end (*t); ++b) {
+ if (outs.count ().get (*t) <= n) {
+ continue;
+ }
+ b->read_from (outs.get (*t, n++), nframes, (*t == DataType::AUDIO ? 0 : -Port::port_offset()));
+ }
+ }
+ }
+
+out:
_active = _pending_active;
}
XMLNode& node (IOProcessor::state (full_state));
if (_role & Main) {
- node.add_property("type", "main-outs");
+ node.set_property("type", "main-outs");
} else if (_role & Listen) {
- node.add_property("type", "listen");
+ node.set_property("type", "listen");
} else {
- node.add_property("type", "delivery");
+ node.set_property("type", "delivery");
}
- node.add_property("role", enum_2_string(_role));
+ node.set_property("role", _role);
if (_panshell) {
node.add_child_nocopy (_panshell->get_state ());
int
Delivery::set_state (const XMLNode& node, int version)
{
- const XMLProperty* prop;
-
if (IOProcessor::set_state (node, version)) {
return -1;
}
- if ((prop = node.property ("role")) != 0) {
- _role = Role (string_2_enum (prop->value(), _role));
+ if (node.get_property ("role", _role)) {
// std::cerr << this << ' ' << _name << " set role to " << enum_2_string (_role) << std::endl;
} else {
// std::cerr << this << ' ' << _name << " NO ROLE INFO\n";
}
void
-Delivery::flush_buffers (framecnt_t nframes)
+Delivery::flush_buffers (samplecnt_t nframes)
{
/* io_lock, not taken: function must be called from Session::process() calltree */
}
void
-Delivery::transport_stopped (framepos_t now)
+Delivery::non_realtime_transport_stop (samplepos_t now, bool flush)
{
- Processor::transport_stopped (now);
+ Processor::non_realtime_transport_stop (now, flush);
if (_panshell) {
- _panshell->pannable()->transport_stopped (now);
+ _panshell->pannable()->non_realtime_transport_stop (now, flush);
}
- if (_output) {
- PortSet& ports (_output->ports());
+ if (_output) {
+ PortSet& ports (_output->ports());
- for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- i->transport_stopped ();
- }
- }
+ for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
+ i->transport_stopped ();
+ }
+ }
}
void
Delivery::realtime_locate ()
{
- if (_output) {
- PortSet& ports (_output->ports());
+ if (_output) {
+ PortSet& ports (_output->ports());
- for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
- i->realtime_locate ();
- }
- }
+ for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
+ i->realtime_locate ();
+ }
+ }
}
gain_t
we're not monitoring, then be quiet.
*/
- if (_role == Main && _session.config.get_use_monitor_fades() && _no_outs_cuz_we_no_monitor) {
+ if (_no_outs_cuz_we_no_monitor) {
return GAIN_COEFF_ZERO;
}
- MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
-
- switch (_role) {
- case Main:
- mp = MuteMaster::Main;
- break;
- case Listen:
- mp = MuteMaster::Listen;
- break;
- case Send:
- case Insert:
- case Aux:
- if (_pre_fader) {
- mp = MuteMaster::PreFader;
- } else {
- mp = MuteMaster::PostFader;
- }
- break;
- }
+ MuteMaster::MutePoint mp = MuteMaster::Main; // stupid gcc uninit warning
- gain_t desired_gain = _mute_master->mute_gain_at (mp);
+ switch (_role) {
+ case Main:
+ mp = MuteMaster::Main;
+ break;
+ case Listen:
+ mp = MuteMaster::Listen;
+ break;
+ case Send:
+ case Insert:
+ case Aux:
+ if (_pre_fader) {
+ mp = MuteMaster::PreFader;
+ } else {
+ mp = MuteMaster::PostFader;
+ }
+ break;
+ }
- if (_role == Listen && _session.monitor_out() && !_session.listening()) {
+ gain_t desired_gain = _mute_master->mute_gain_at (mp);
- /* nobody is soloed, and this delivery is a listen-send to the
- control/monitor/listen bus, we should be silent since
- it gets its signal from the master out.
- */
+ if (_role == Listen && _session.monitor_out() && !_session.listening()) {
- desired_gain = GAIN_COEFF_ZERO;
+ /* nobody is soloed, and this delivery is a listen-send to the
+ * control/monitor/listen bus, we should be silent since
+ * it gets its signal from the master out.
+ */
- }
+ desired_gain = GAIN_COEFF_ZERO;
+ }
return desired_gain;
}