Fix for last commit where rec enable state was not considered. Change adat option...

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

diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc
index e5a67bcb1fd4e96dd36f4e9b0494f1ed72169448..2b4f38c07068983ed0c1c0383839019bec59bbdc 100644 (file)
--- a/libs/ardour/audio_track.cc
+++ b/libs/ardour/audio_track.cc
@@ -477,12 +477,12 @@ AudioTrack::no_roll (nframes_t nframes, nframes_t start_frame, nframes_t end_fra
                send_silence = true;
        } else {
 
-               if (Config->get_adat_monitor_mode()) {
+               if (!Config->get_tape_machine_mode()) {
                        /* 
                           ADATs work in a strange way.. 
                           they monitor input always when stopped.and auto-input is engaged. 
                        */
-                       if (Config->get_monitoring_model() == SoftwareMonitoring && Config->get_auto_input()) {
+                       if ((Config->get_monitoring_model() == SoftwareMonitoring) && (Config->get_auto_input () || _diskstream->record_enabled())) {
                                send_silence = false;
                        } else {
                                send_silence = true;