compensate for processor latency during bounce

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 0530dbfce93abd16b1ef1e7e9827dd3495ad812d..61b6e56bb6676d871d884607e6d3b03a99d4a1af 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -60,13 +60,7 @@ AudioTrack::~AudioTrack ()
 boost::shared_ptr<Diskstream>
 AudioTrack::create_diskstream ()
 {
-       AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
-
-       if (_flags & Auditioner) {
-               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden);
-       } else {
-               dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);
-       }
+       AudioDiskstream::Flag dflags = AudioDiskstream::Flag (AudioDiskstream::Recordable);
 
        if (_mode == Destructive) {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Destructive);
@@ -96,7 +90,7 @@ AudioTrack::set_diskstream (boost::shared_ptr<Diskstream> ds)
        }
 
        _diskstream->set_record_enabled (false);
-       _diskstream->request_jack_monitors_input (false);
+       _diskstream->request_input_monitoring (false);
 
        DiskstreamChanged (); /* EMIT SIGNAL */
 }
@@ -375,6 +369,13 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        process_output_buffers (bufs, start_frame, end_frame, nframes, declick, (!diskstream->record_enabled() && _session.transport_rolling()));
 
+       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
+               boost::shared_ptr<Delivery> d = boost::dynamic_pointer_cast<Delivery> (*i);
+               if (d) {
+                       d->flush_buffers (nframes);
+               }
+       }
+
        need_butler = diskstream->commit (playback_distance);
 
        return 0;
@@ -416,38 +417,7 @@ AudioTrack::export_stuff (BufferSet& buffers, framepos_t start, framecnt_t nfram
                }
        }
 
-       // If no processing is required, there's no need to go any further.
-
-       if (!endpoint && !include_endpoint) {
-               return 0;
-       }
-
-       for (ProcessorList::iterator i = _processors.begin(); i != _processors.end(); ++i) {
-
-               if (!include_endpoint && (*i) == endpoint) {
-                       break;
-               }
-               
-               /* if we're not exporting, stop processing if we come across a routing processor.
-                */
-               
-               if (!for_export && (*i)->does_routing()) {
-                       break;
-               }
-
-               /* even for export, don't run any processor that does routing. 
-
-                  oh, and don't bother with the peak meter either.
-                */
-
-               if (!(*i)->does_routing() && !boost::dynamic_pointer_cast<PeakMeter>(*i)) {
-                       (*i)->run (buffers, start, start+nframes, nframes, true);
-               }
-               
-               if ((*i) == endpoint) {
-                       break;
-               }
-       }
+       bounce_process (buffers, start, nframes, endpoint, include_endpoint, for_export);
 
        return 0;
 }