From: Paul Davis <paul@linuxaudiosystems.com>
Date: Thu, 20 Oct 2011 19:20:44 +0000 (+0000)
Subject: obey monitor=disk when recording also; remove debug output
X-Git-Tag: 3.0-beta1~321
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=00ddd099ed5cd6e0d77448670381d13d88b96218;p=ardour.git

obey monitor=disk when recording also; remove debug output

git-svn-id: svn://localhost/ardour2/branches/3.0@10258 d708f5d6-7413-0410-9779-e7cbd77b26cf
---

diff --git a/libs/ardour/audio_diskstream.cc b/libs/ardour/audio_diskstream.cc
index 436506c857..f5733cd6a4 100644
--- a/libs/ardour/audio_diskstream.cc
+++ b/libs/ardour/audio_diskstream.cc
@@ -56,6 +56,7 @@
 #include "ardour/send.h"
 #include "ardour/session.h"
 #include "ardour/source_factory.h"
+#include "ardour/track.h"
 #include "ardour/utils.h"
 #include "ardour/session_playlists.h"
 #include "ardour/route.h"
@@ -566,7 +567,7 @@ AudioDiskstream::process (framepos_t transport_frame, pframes_t nframes, bool ca
 		collect_playback = true;
 	}
 
-	if (collect_playback) {
+	if ((_track->monitoring() & MonitorDisk) || collect_playback) {
 
 		/* we're doing playback */
 
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) {