mirror of
https://github.com/Ardour/ardour.git
synced 2025-12-15 19:16:40 +01:00
Consistently ignore punch-in/out without punch-range
This commit is contained in:
parent
51030a9a40
commit
50e5e3bd8f
3 changed files with 3 additions and 3 deletions
|
|
@ -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();
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
|
|
@ -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.
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue