ardour/livetrax
13
0
Fork 0
Code

Auto Monitoring takes TriggerBox into account

Browse Source 
MonitoringDisk is now only set implicitly if the triggerbox
contains no cues.
This commit is contained in:
Robin Gareus 2022-02-04 01:08:53 +01:00
parent 18207c6896
commit 5e2912b7eb
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
2 changed files with 18 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
libs/ardour/ardour/session_configuration_vars.h
View File

@ -36,6 +36,7 @@ CONFIG_VARIABLE (HeaderFormat, native_file_header_format, "native-file-header-f
CONFIG_VARIABLE (bool, auto_play, "auto-play", false)
CONFIG_VARIABLE (bool, auto_return, "auto-return", false)
CONFIG_VARIABLE (bool, auto_input, "auto-input", true)
CONFIG_VARIABLE (bool, triggerbox_overrides_disk_monitoring, "triggerbox-overrides-disk-monitoring", true)
CONFIG_VARIABLE (bool, punch_in, "punch-in", false)
CONFIG_VARIABLE (bool, punch_out, "punch-out", false)
CONFIG_VARIABLE (bool, count_in, "count-in", false)

24
libs/ardour/route.cc
View File

@ -6324,6 +6324,11 @@ operator| (const MonitorState& a, const MonitorState& b) {
return static_cast<MonitorState> (static_cast <int>(a) | static_cast<int> (b));
}
static inline MonitorState
operator& (const MonitorState& a, const MonitorState& b) {
return static_cast<MonitorState> (static_cast <int>(a) & static_cast<int> (b));
}
MonitorState
Route::monitoring_state () const
{
@ -6349,9 +6354,14 @@ Route::monitoring_state () const
return ms;
}
/* When TriggerBox is not empty, do not implicitly monitor Disk */
bool const tod = _session.config.get_triggerbox_overrides_disk_monitoring ();
MonitorState auto_monitor_disk = !tod || (_triggerbox && _triggerbox->empty ()) ? MonitoringDisk : MonitoringSilence;
MonitorState auto_monitor_mask = !tod || (_triggerbox && _triggerbox->empty ()) ? MonitoringCue : MonitoringInput;
switch (_session.config.get_session_monitoring ()) {
case MonitorDisk:
return MonitoringDisk;
return auto_monitor_disk;
break;
case MonitorInput:
return MonitoringInput;
@ -6401,15 +6411,15 @@ Route::monitoring_state () const
if (track_rec) {
if (!session_rec && roll && auto_input) {
return MonitoringDisk | get_input_monitoring_state (false, false);
return auto_monitor_disk | get_input_monitoring_state (false, false);
} else {
/* recording */
const samplecnt_t prtl = _session.preroll_record_trim_len ();
if (session_rec && roll && prtl > 0 && _disk_writer->get_captured_samples () < prtl) {
/* CUE monitor during pre-roll */
return MonitoringDisk | get_input_monitoring_state (true, false);
return auto_monitor_disk | (get_input_monitoring_state (true, false) & auto_monitor_mask);
}
return get_input_monitoring_state (true, false);
return get_input_monitoring_state (true, false) & auto_monitor_mask;
}
} else {
@ -6417,14 +6427,14 @@ Route::monitoring_state () const
if (auto_input_does_talkback) {
if (!roll && auto_input) {
return get_input_monitoring_state (false, true);
return get_input_monitoring_state (false, true) & auto_monitor_mask;
} else {
return MonitoringDisk | get_input_monitoring_state (false, false);
return auto_monitor_disk | get_input_monitoring_state (false, false);
}
} else {
/* tape-machine-mode */
return MonitoringDisk | get_input_monitoring_state (false, false);
return auto_monitor_disk | get_input_monitoring_state (false, false);
}
}