merge with master, with minor conflict fixes

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 70f385a8902257e80eb1a6ef2e91dc9353dabb9e..8e14fff40225e36cc05d3ed562f7e07d756a16c1 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;
        }
 
@@ -325,6 +325,9 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        if (!_active) {
                silence (nframes);
+               if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
+                       _meter->reset();
+               }
                return 0;
        }
 
@@ -350,11 +353,11 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
        _silent = false;
        _amp->apply_gain_automation(false);
 
-       BufferSet& bufs = _session.get_scratch_buffers (n_process_buffers ());
+       BufferSet& bufs = _session.get_route_buffers (n_process_buffers ());
 
        fill_buffers_with_input (bufs, _input, nframes);
        
-       if (_meter_point == MeterInput && (_monitoring & MonitorInput)) {
+       if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
                _meter->run (bufs, start_frame, end_frame, nframes, true);
        }