Make Soundcloud upload applicable to any export format.

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 6de833aeb4f5b3332299782d2b627cdd49275d42..94201882e7b29e6bdfc2d4f429f1b2c7bce2dce5 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 */
 }
@@ -313,6 +307,12 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        Glib::Threads::RWLock::ReaderLock lm (_processor_lock, Glib::Threads::TRY_LOCK);
 
        if (!lm.locked()) {
+               boost::shared_ptr<AudioDiskstream> diskstream = audio_diskstream();
+               framecnt_t playback_distance = diskstream->calculate_playback_distance(nframes);
+               if (can_internal_playback_seek(llabs(playback_distance))) {
+                       /* TODO should declick */
+                       internal_playback_seek(playback_distance);
+               }
                return 0;
        }
 
@@ -369,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;