diff options
| -rw-r--r-- | libs/ardour/ardour/rc_configuration_vars.h | 2 | ||||
| -rw-r--r-- | libs/ardour/audio_track.cc | 11 |
2 files changed, 6 insertions, 7 deletions
diff --git a/libs/ardour/ardour/rc_configuration_vars.h b/libs/ardour/ardour/rc_configuration_vars.h index 73d9adf84c..3d8094d39c 100644 --- a/libs/ardour/ardour/rc_configuration_vars.h +++ b/libs/ardour/ardour/rc_configuration_vars.h @@ -132,7 +132,7 @@ CONFIG_VARIABLE (bool, latched_record_enable, "latched-record-enable", false) CONFIG_VARIABLE (bool, all_safe, "all-safe", false) CONFIG_VARIABLE (bool, show_solo_mutes, "show-solo-mutes", true) CONFIG_VARIABLE (bool, solo_mute_override, "solo-mute-override", false) -CONFIG_VARIABLE (bool, tape_machine_mode, "tape-machine-mode", true) +CONFIG_VARIABLE (bool, auto_input_does_talkback, "auto-input-does-talkback", false) CONFIG_VARIABLE (gain_t, solo_mute_gain, "solo-mute-gain", 0.0) CONFIG_VARIABLE (std::string, monitor_bus_preferred_bundle, "monitor-bus-preferred-bundle", "") CONFIG_VARIABLE (bool, quieten_at_speed, "quieten-at-speed", true) 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; } } |