diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2013-07-17 08:05:59 -0400 |
| commit | 650964f3203319b013c49a286b5fc5fc203f3bbb (patch) | |
| tree | 60b2f879d4ed634f9420a737886086db5eb31f78 /libs/ardour/audio_track.cc | |
| parent | 9cbe231b920d92a2e44e08962a3ed6870b962f34 (diff) | |
| parent | 780397d0ccf8df54eeb78c88eebbaab0c2745029 (diff) | |
Merge branch 'master' into windows
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index b4ca9e2df8..4b33bbd4c6 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -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); } |