diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-20 21:27:44 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-10-20 21:27:44 +0000 |
commit | 454f14d9c58de541a230c266ad59987b8ca7b1a4 (patch) | |
tree | 90c87b3fb0a36548aca1a27feb31890f1238fb44 /libs | |
parent | 8b7843917303eb1911fa0711b5908c4c0534d95a (diff) |
make monitor=In work during no-roll conditions without auto-input
git-svn-id: svn://localhost/ardour2/branches/3.0@10261 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/ardour/track.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/libs/ardour/track.cc b/libs/ardour/track.cc index b21a02b490..218120a924 100644 --- a/libs/ardour/track.cc +++ b/libs/ardour/track.cc @@ -665,7 +665,8 @@ Track::send_silence () const */ if ((Config->get_monitoring_model() == SoftwareMonitoring) - && (!(_monitoring & MonitorDisk) && (_session.config.get_auto_input () || _diskstream->record_enabled()))) { + && ((_monitoring & MonitorInput) || + (!(_monitoring & MonitorDisk) && (_session.config.get_auto_input () || _diskstream->record_enabled())))){ send_silence = false; } else { send_silence = true; |