smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-13 18:16:35 +01:00
Code Issues Projects Releases Wiki Activity

Change tape-machine-mode to auto-input-does-talkback (libardour part)

Browse source 
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.
This commit is contained in:
Ben Loftis 2020-01-20 12:13:48 -06:00
parent 42630f145a
commit 9d2a209f60
2 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

2
libs/ardour/ardour/rc_configuration_vars.h
View file

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

11
libs/ardour/audio_track.cc
View file

@ -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;
}
}