smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-01 03:17:39 +01:00
Code Issues Projects Releases Wiki Activity

try to restore original semantics for scheduling butler transport work in Session::locate()

Browse source
This commit is contained in:
Paul Davis 2015-02-17 11:21:41 -05:00
parent 130c25a636
commit 63dcc20fdb
1 changed files with 8 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

10
libs/ardour/session_transport.cc
View file

@ -1023,6 +1023,8 @@ Session::micro_locate (framecnt_t distance)
void
Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool for_seamless_loop, bool force, bool with_mmc)
{
bool need_butler = false;
/* Locates for seamless looping are fairly different from other
* locates. They assume that the diskstream buffers for each track
* already have the correct data in them, and thus there is no need to
@ -1098,7 +1100,8 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
}
add_post_transport_work (todo);
need_butler = true;
} else {
/* this is functionally what clear_clicks() does but with a tentative lock */
@ -1165,6 +1168,7 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
* end.
*/
add_post_transport_work (PostTransportLocate);
need_butler = true;
}
}
@ -1189,7 +1193,9 @@ Session::locate (framepos_t target_frame, bool with_roll, bool with_flush, bool
}
}
_butler->schedule_transport_work ();
if (need_butler) {
_butler->schedule_transport_work ();
}
loop_changing = false;