#include "ardour/port.h"
#include "ardour/session.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
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, framepos_t start_frame, framepos_t end_frame, 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) {
-
- bufs.set_count (output_buffers().count ());
-
- if (_role != Main) {
+ if (tgain != _current_gain) {
+ /* target gain has changed */
- /* 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.
- */
+ _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
- } else {
+ } else if (tgain < GAIN_COEFF_SMALL) {
- /* main outs have no automatable gain, the amp is just
- * used for ramping gain changes caused by monitoring
- * state changes.
+ /* we were quiet last time, and we're still supposed to be quiet.
+ Silence the outputs, and make sure the buffers are quiet too,
*/
- _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);
_panshell->run (bufs, output_buffers(), start_frame, end_frame, 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, ports.port(0)->port_offset());
+ }
}
} else {
// 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
+ // XXX how does this interact with Port::increment_global_port_buffer_offset ?
+ 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, ports.port(0)->port_offset());
+ }
}
}
- if (result_required) {
- bufs.read_from (output_buffers (), nframes);
- }
+ if (result_required) {
+ bufs.read_from (output_buffers (), nframes);
+ }
- out:
+out:
_active = _pending_active;
}
int
Delivery::set_state (const XMLNode& node, int version)
{
- const XMLProperty* prop;
+ XMLProperty const * prop;
if (IOProcessor::set_state (node, version)) {
return -1;
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;
}