: 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));
+ DEBUG_TRACE (DEBUG::Destruction, string_compose ("delivery %1 destructor\n", _name));
/* this object should vanish from any signal callback lists
that it is on before we get any further. The full qualification
- of the method name is not necessary, but is here to make it
+ of the method name is not necessary, but is here to make it
clear that this call is about signals, not data flow connections.
*/
PortSet& ports (_output->ports());
gain_t tgain;
- bool need_amp = true;
if (_output->n_ports ().get (_output->default_type()) == 0) {
goto out;
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 (tgain != _current_gain) {
+ /* target gain has changed */
- if (_role != Main) {
+ _current_gain = Amp::apply_gain (bufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
- /* 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.
- */
+ } else if (tgain < GAIN_COEFF_SMALL) {
- } 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);
+ /* we were quiet last time, and we're still supposed to be quiet.
+ Silence the outputs, and make sure the buffers are quiet too,
+ */
+ _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
{
if (_output) {
return _output->n_ports().n_audio();
- }
+ }
return _configured_output.n_audio();
}
if (!_output) {
return;
}
-
+
PortSet& ports (_output->ports());
for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {
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;
}
} else {
if (role() == Listen) {
/* We're going to the monitor bus, so discard MIDI data */
-
+
uint32_t const bufs_audio = bufs.count().get (DataType::AUDIO);
uint32_t const mixbufs_audio = mixbufs.count().get (DataType::AUDIO);
-
+
/* monitor-section has same number of channels as master-bus (on creation).
*
* There is no clear answer what should happen when trying to PFL or AFL
gain_t tgain = target_gain ();
- _amp->set_gain (tgain, this);
+ if (tgain != _current_gain) {
+
+ /* target gain has changed */
+
+ _current_gain = Amp::apply_gain (mixbufs, _session.nominal_frame_rate(), nframes, _current_gain, tgain);
+
+ } else if (tgain == GAIN_COEFF_ZERO) {
- if (tgain == GAIN_COEFF_ZERO && _amp->gain() == GAIN_COEFF_ZERO) {
/* we were quiet last time, and we're still supposed to be quiet.
- */
+ */
_meter->reset ();
Amp::apply_simple_gain (mixbufs, nframes, GAIN_COEFF_ZERO);
goto out;
- }
+ } else if (tgain != GAIN_COEFF_UNITY) {
- /* These two calls will either set up gain automation or mark
- the amp as ready to use a simple scalar gain.
- */
+ /* target gain has not changed, but is not zero or unity */
+ Amp::apply_simple_gain (mixbufs, nframes, tgain);
+ }
_amp->set_gain_automation_buffer (_session.send_gain_automation_buffer ());
_amp->setup_gain_automation (start_frame, end_frame, nframes);
for (BufferSet::audio_iterator b = mixbufs.audio_begin(); b != mixbufs.audio_end(); ++b) {
b->prepare ();
}
-}
+}
projects / ardour.git / commitdiff