Add loudness normalization to Export Format & Graph

[ardour.git] / libs / ardour / delivery.cc

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 359b029d0c0213fcd98239708af98ef40581cae6..c538f6be8a5d597bb572cde045c313e54e6b731c 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -97,11 +97,11 @@ Delivery::Delivery (Session& s, boost::shared_ptr<Pannable> pannable, boost::sha
 
 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.
        */
 
@@ -236,7 +236,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
        PortSet& ports (_output->ports());
        gain_t tgain;
 
-       if (_output->n_ports ().get (_output->default_type()) == 0) {
+       if (ports.num_ports () == 0) {
                goto out;
        }
 
@@ -246,8 +246,8 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
        }
 
        /* 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);
@@ -267,8 +267,8 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
        } else if (tgain < GAIN_COEFF_SMALL) {
 
                /* we were quiet last time, and we're still supposed to be quiet.
-                  Silence the outputs, and make sure the buffers are quiet too,
-               */
+                        Silence the outputs, and make sure the buffers are quiet too,
+                        */
 
                _output->silence (nframes);
                if (result_required) {
@@ -283,6 +283,14 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
                Amp::apply_simple_gain (bufs, nframes, tgain);
        }
 
+       // Speed quietning
+
+       if (fabs (_session.transport_speed()) > 1.5 && Config->get_quieten_at_speed ()) {
+               Amp::apply_simple_gain (bufs, nframes, speed_quietning, false);
+       }
+
+       // Panning
+
        if (_panshell && !_panshell->bypassed() && _panshell->panner()) {
 
                // Use the panner to distribute audio to output port buffers
@@ -292,7 +300,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
                // MIDI 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);
+                       _output->copy_to_outputs (bufs, DataType::MIDI, nframes, ports.port(0)->port_offset());
                }
 
        } else {
@@ -301,18 +309,18 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pf
 
                if (bufs.count().n_audio() > 0 && ports.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);
+                       _output->copy_to_outputs (bufs, DataType::MIDI, 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;
 }
 
@@ -386,7 +394,7 @@ Delivery::pan_outs () const
 {
        if (_output) {
                return _output->n_ports().n_audio();
-       } 
+       }
 
        return _configured_output.n_audio();
 }
@@ -454,7 +462,7 @@ Delivery::flush_buffers (framecnt_t nframes)
        if (!_output) {
                return;
        }
-       
+
        PortSet& ports (_output->ports());
 
        for (PortSet::iterator i = ports.begin(); i != ports.end(); ++i) {