diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-20 19:20:44 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-20 19:20:44 +0000 |
| commit | 00ddd099ed5cd6e0d77448670381d13d88b96218 (patch) | |
| tree | 0fbe10a6b4d7c67a116f54b036a76d87d9f0f405 /libs/ardour/audio_track.cc | |
| parent | 533045aea379110f24c55427eb9d5ab4338e00cf (diff) | |
obey monitor=disk when recording also; remove debug output
git-svn-id: svn://localhost/ardour2/branches/3.0@10258 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index b22b28d277..64e83ddb0d 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -403,16 +403,15 @@ AudioTrack::roll (pframes_t nframes, framepos_t start_frame, framepos_t end_fram _input->process_input (_meter, start_frame, end_frame, nframes); } - if ((_monitoring & MonitorInput) || - (!(_monitoring & MonitorDisk) && - (diskstream->record_enabled() && !can_record && !_session.config.get_auto_input()))) { + if ((_monitoring & MonitorInput) || (!(_monitoring & MonitorDisk) && + (diskstream->record_enabled() && + !can_record && + !_session.config.get_auto_input()))) { /* not actually recording, but we want to hear the input material anyway, at least potentially (depending on monitoring options) */ - cerr << name() << " do the passthru thing with monitoring = " << enum_2_string (_monitoring) << endl; - passthru (start_frame, end_frame, nframes, false); } else if ((b = diskstream->playback_buffer(0)) != 0) { |