Make stem export export from right before any processors.

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

diff --git a/libs/ardour/delivery.cc b/libs/ardour/delivery.cc
index 700efd8ac1eae88e52036f5e456c2e4b62431e04..80135baf28c0da2d77a49b5469369d7e53904eb8 100644 (file)
--- a/libs/ardour/delivery.cc
+++ b/libs/ardour/delivery.cc
@@ -43,9 +43,9 @@ using namespace std;
 using namespace PBD;
 using namespace ARDOUR;
 
-PBD::Signal1<void,nframes_t> Delivery::CycleStart;
-PBD::Signal0<int>           Delivery::PannersLegal;
-bool                                     Delivery::panners_legal = false;
+PBD::Signal1<void, pframes_t> Delivery::CycleStart;
+PBD::Signal0<int>             Delivery::PannersLegal;
+bool                          Delivery::panners_legal = false;
 
 /* deliver to an existing IO object */
 
@@ -115,14 +115,14 @@ Delivery::display_name () const
 }
 
 void
-Delivery::cycle_start (nframes_t /*nframes*/)
+Delivery::cycle_start (pframes_t /*nframes*/)
 {
        _output_offset = 0;
        _no_outs_cuz_we_no_monitor = false;
 }
 
 void
-Delivery::increment_output_offset (nframes_t n)
+Delivery::increment_output_offset (framecnt_t n)
 {
        _output_offset += n;
 }
@@ -226,7 +226,7 @@ Delivery::configure_io (ChanCount in, ChanCount out)
 }
 
 void
-Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nframes_t nframes, bool result_required)
+Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, pframes_t nframes, bool result_required)
 {
        assert (_output);
 
@@ -246,7 +246,7 @@ Delivery::run (BufferSet& bufs, framepos_t start_frame, framepos_t end_frame, nf
           processing pathway that wants to use this->output_buffers() for some reason.
        */
 
-       output_buffers().attach_buffers (ports, nframes, _output_offset);
+       output_buffers().get_jack_port_addresses (ports, nframes, _output_offset);
 
        // this Delivery processor is not a derived type, and thus we assume
        // we really can modify the buffers passed in (it is almost certainly
@@ -441,7 +441,7 @@ Delivery::end_pan_touch (uint32_t which, bool mark, double when)
 
 
 void
-Delivery::flush_buffers (nframes_t nframes, framepos_t time)
+Delivery::flush_buffers (framecnt_t nframes, framepos_t time)
 {
        /* io_lock, not taken: function must be called from Session::process() calltree */
 
@@ -544,6 +544,6 @@ Delivery::output_changed (IOChange change, void* /*src*/)
 {
        if (change.type & IOChange::ConfigurationChanged) {
                reset_panner ();
+               _output_buffers->attach_buffers (_output->ports ());
        }
 }
-