ardour/livetrax
13
0
Fork 0
Code

implement stop-on-grid

Browse Source
This commit is contained in:
Paul Davis 2024-10-28 14:40:25 -06:00
parent c8313cd749
commit a5dac1578e
2 changed files with 22 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
libs/ardour/session_events.cc
View File

@ -230,7 +230,7 @@ SessionEventManager::merge_event (SessionEvent* ev)
/* try to handle immediate events right here */
if (ev->type == SessionEvent::Locate || ev->type == SessionEvent::LocateRoll) {
if (ev->type == SessionEvent::Locate || ev->type == SessionEvent::LocateRoll || ev->type == SessionEvent::EndRoll) {
/* remove any existing Locates that are waiting to execute */
_clear_event_type (ev->type);
}

21
libs/ardour/session_transport.cc
View File

@ -899,8 +899,27 @@ Session::request_stop (bool abort, bool clear_state, TransportRequestSource orig
solo_selection ( _soloSelection, false );
}
SessionEvent* ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, SessionEvent::Immediate, audible_sample(), 0.0, abort, clear_state);
SessionEvent *ev;
if (Config->get_stop_on_grid() && _global_quantization.type == AnyTime::BBT_Offset && _transport_sample != 0) {
/* XXX for now this only does anything if we are quantized to
* Beats. Other quantization settings require moving
* Editor::snap_to() code into libardour, which is not in-scope
* at the time this work is occuring.
*/
TempoMap::SharedPtr tmap (TempoMap::use());
BBT_Argument now = tmap->bbt_at (timepos_t (_transport_sample));
BBT_Argument rounded = tmap->round_up_to_bar (now);
samplepos_t samples = tmap->sample_at (rounded);
ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, samples, samples, 0.0, abort, clear_state);
DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop @ %4 snapped to %1 => %2 => %3\n", samples, now, rounded, _transport_sample));
} else {
ev = new SessionEvent (SessionEvent::EndRoll, SessionEvent::Add, SessionEvent::Immediate, audible_sample(), 0.0, abort, clear_state);
DEBUG_TRACE (DEBUG::Transport, string_compose ("Request transport stop, audible %3 transport %4 abort = %1, clear state = %2\n", abort, clear_state, audible_sample(), _transport_sample));
}
queue_event (ev);
}