diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2020-01-20 12:13:48 -0600 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2020-01-20 12:19:15 -0600 |
| commit | 9d2a209f6096b4f653e4daa03e279775d06ec81c (patch) | |
| tree | 5af31af6dfba220620fdcca0d246cfbbf2da437e /libs/ardour/audio_track.cc | |
| parent | 42630f145a31d48fb9751c14aa9bd2dcdb3d91b9 (diff) | |
Change tape-machine-mode to auto-input-does-talkback (libardour part)
In prior versions: if Auto Input was enabled, the default behavior was
to monitor the Input of all tracks when stopped; even if they aren't armed.
Tape Machine Mode changed the behavior of Auto Input so that it doesn't
always monitor the track inputs when transport is stopped.
After some discussion on IRC, we determined that Tape mode is likely
more practical for a DAW user, and therefore a better default.
Rather than default an ambiguously-named preference "on", we decided
to invert the behavior, rename it sensibly(?), and default it OFF.
Diffstat (limited to 'libs/ardour/audio_track.cc')
| -rw-r--r-- | libs/ardour/audio_track.cc | 11 |
1 files changed, 5 insertions, 6 deletions
diff --git a/libs/ardour/audio_track.cc b/libs/ardour/audio_track.cc index 0f4d7dbd1d..b90d1392b6 100644 --- a/libs/ardour/audio_track.cc +++ b/libs/ardour/audio_track.cc @@ -81,7 +81,7 @@ AudioTrack::get_auto_monitoring_state () const bool const track_rec = _disk_writer->record_enabled (); bool const auto_input = _session.config.get_auto_input (); bool const software_monitor = Config->get_monitoring_model() == SoftwareMonitoring; - bool const tape_machine_mode = Config->get_tape_machine_mode (); + bool const auto_input_does_talkback = Config->get_auto_input_does_talkback (); bool session_rec; /* I suspect that just use actively_recording() is good enough all the @@ -118,11 +118,7 @@ AudioTrack::get_auto_monitoring_state () const } else { - if (tape_machine_mode) { - - return MonitoringDisk; - - } else { + if (auto_input_does_talkback) { if (!roll && auto_input) { return software_monitor ? MonitoringInput : MonitoringSilence; @@ -130,6 +126,9 @@ AudioTrack::get_auto_monitoring_state () const return MonitoringDisk; } + } else { + + return MonitoringDisk; } } |