ardour/livetrax
13
0
Fork 0
Code

do not change Session::_transport_frame is a locate is pending

Browse Source
This commit is contained in:
Paul Davis 2017-07-05 13:33:55 -04:00
parent 6fb212a6f6
commit 871428576c
1 changed files with 33 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
libs/ardour/session_process.cc
View File

@ -428,12 +428,16 @@ Session::process_with_events (pframes_t nframes)
} }
} }
if (_transport_speed == 1.0) { if (locate_pending()) {
frames_moved = (framecnt_t) nframes; frames_moved = 0;
} else { } else {
interpolation.set_target_speed (_target_transport_speed); if (_transport_speed == 1.0) {
interpolation.set_speed (_transport_speed); frames_moved = (framecnt_t) nframes;
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0); } else {
interpolation.set_target_speed (_target_transport_speed);
interpolation.set_speed (_transport_speed);
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
}
} }
end_frame = _transport_frame + frames_moved; end_frame = _transport_frame + frames_moved;
@ -482,7 +486,11 @@ Session::process_with_events (pframes_t nframes)
while (nframes) { while (nframes) {
this_nframes = nframes; /* real (jack) time relative */ this_nframes = nframes; /* real (jack) time relative */
frames_moved = (framecnt_t) floor (_transport_speed * nframes); /* transport relative */ if (locate_pending()) {
frames_moved = 0;
} else {
frames_moved = (framecnt_t) floor (_transport_speed * nframes); /* transport relative */
}
/* running an event, position transport precisely to its time */ /* running an event, position transport precisely to its time */
if (this_event && this_event->action_frame <= end_frame && this_event->action_frame >= _transport_frame) { if (this_event && this_event->action_frame <= end_frame && this_event->action_frame >= _transport_frame) {
@ -508,7 +516,7 @@ Session::process_with_events (pframes_t nframes)
if (frames_moved < 0) { if (frames_moved < 0) {
decrement_transport_position (-frames_moved); decrement_transport_position (-frames_moved);
} else { } else if (frames_moved) {
increment_transport_position (frames_moved); increment_transport_position (frames_moved);
} }
@ -865,11 +873,17 @@ Session::follow_slave_silently (pframes_t nframes, float slave_speed)
_butler->summon (); _butler->summon ();
} }
int32_t frames_moved = (int32_t) floor (_transport_speed * nframes); int32_t frames_moved;
if (locate_pending()) {
frames_moved = 0;
} else {
frames_moved = (int32_t) floor (_transport_speed * nframes);
}
if (frames_moved < 0) { if (frames_moved < 0) {
decrement_transport_position (-frames_moved); decrement_transport_position (-frames_moved);
} else { } else if (frames_moved) {
increment_transport_position (frames_moved); increment_transport_position (frames_moved);
} }
@ -901,12 +915,16 @@ Session::process_without_events (pframes_t nframes)
return; return;
} }
if (_transport_speed == 1.0) { if (locate_pending()) {
frames_moved = (framecnt_t) nframes; frames_moved = 0;
} else { } else {
interpolation.set_target_speed (_target_transport_speed); if (_transport_speed == 1.0) {
interpolation.set_speed (_transport_speed); frames_moved = (framecnt_t) nframes;
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0); } else {
interpolation.set_target_speed (_target_transport_speed);
interpolation.set_speed (_transport_speed);
frames_moved = (framecnt_t) interpolation.interpolate (0, nframes, 0, 0);
}
} }
if (!_exporting && !timecode_transmission_suspended()) { if (!_exporting && !timecode_transmission_suspended()) {
@ -937,7 +955,7 @@ Session::process_without_events (pframes_t nframes)
if (frames_moved < 0) { if (frames_moved < 0) {
decrement_transport_position (-frames_moved); decrement_transport_position (-frames_moved);
} else { } else if (frames_moved) {
increment_transport_position (frames_moved); increment_transport_position (frames_moved);
} }