allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

Consistently ignore punch-in/out without punch-range

Browse Source
This commit is contained in:
Robin Gareus
2024-07-23 18:56:26 +02:00
parent 51030a9a40
commit 50e5e3bd8f
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/route.cc
View File

@@ -6198,7 +6198,7 @@ Route::monitoring_state () const
* TODO: FIXME
*/
if (_session.config.get_punch_in() || _session.config.get_punch_out()) {
if ((_session.config.get_punch_in() || _session.config.get_punch_out()) && 0 != _session.locations()->auto_punch_location ()) {
session_rec = _session.actively_recording ();
} else {
session_rec = _session.get_record_enabled();

2
libs/ardour/session.cc
View File

@@ -2288,7 +2288,7 @@ Session::maybe_enable_record (bool rt_context)
if (_transport_fsm->transport_speed() != 0) {
maybe_allow_only_punch ();
if (!config.get_punch_in()) {
if (!config.get_punch_in() || 0 == locations()->auto_punch_location ()) {
enable_record ();
}
/* When rolling, start recording immediately.

2
libs/ardour/session_transport.cc
View File

@@ -521,7 +521,7 @@ Session::start_transport (bool after_loop)
switch (record_status()) {
case Enabled:
if (!config.get_punch_in()) {
if (!config.get_punch_in() || 0 == locations()->auto_punch_location ()) {
/* This is only for UIs (keep blinking rec-en before
* punch-in, don't show rec-region etc). The UI still
* depends on SessionEvent::PunchIn and ensuing signals.