ardour/livetrax
13
0
Fork 0
Code

account for clip recording when computing monitoring state

Browse Source
This commit is contained in:
Paul Davis 2024-09-30 13:17:15 -06:00
parent a357575954
commit 7455b99b45
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libs/ardour/route.cc
View File

@ -6188,6 +6188,7 @@ Route::monitoring_state () const
bool const roll = _session.transport_state_rolling ();
bool const auto_input = _session.config.get_auto_input ();
bool const clip_rec = _triggerbox && _triggerbox->record_enabled();
bool const track_rec = _disk_writer->record_enabled ();
bool session_rec;
@ -6217,14 +6218,14 @@ Route::monitoring_state () const
session_rec = _session.get_record_enabled();
}
if (track_rec) {
if (track_rec || clip_rec) {
if (!session_rec && roll && auto_input) {
if (!clip_rec && (!session_rec && roll && auto_input)) {
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) {
if (!clip_rec && session_rec && roll && prtl > 0 && _disk_writer->get_captured_samples () < prtl) {
/* CUE monitor during pre-roll */
return auto_monitor_disk | (get_input_monitoring_state (true, false) & auto_monitor_mask);
}