smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-04 12:45:45 +01:00
Code Issues Projects Releases Wiki Activity

obey monitor=disk when recording also; remove debug output

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@10258 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2011-10-20 19:20:44 +00:00
parent 533045aea3
commit 00ddd099ed
2 changed files with 6 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

3
libs/ardour/audio_diskstream.cc
View file

@ -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 */

9
libs/ardour/audio_track.cc
View file

@ -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) {