Revert "Revert new meter types (postponed until after 3.3 release)"

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index 070a7453fb1a7212a76890f7135979ece14533b3..4b33bbd4c656f45f22e74926fd9dc597945d260c 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -62,7 +62,7 @@ AudioTrack::create_diskstream ()
 {
        AudioDiskstream::Flag dflags = AudioDiskstream::Flag (0);
 
-       if (_flags & Hidden) {
+       if (_flags & Auditioner) {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Hidden);
        } else {
                dflags = AudioDiskstream::Flag (dflags | AudioDiskstream::Recordable);
@@ -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;
        }
 
@@ -354,7 +357,7 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram
 
        fill_buffers_with_input (bufs, _input, nframes);
        
-       if (_meter_point == MeterInput) {
+       if (_meter_point == MeterInput && (_monitoring & MonitorInput || _diskstream->record_enabled())) {
                _meter->run (bufs, start_frame, end_frame, nframes, true);
        }