smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-15 19:16:40 +01:00
Code Issues Projects Releases Wiki Activity

fix merge conflicts with master

Browse source
This commit is contained in:
Paul Davis 2013-09-14 16:42:40 -04:00
commit 7a30e63eaa
213 changed files with 29641 additions and 21838 deletions
Download patch file Download diff file Expand all files Collapse all files

9
gtk2_ardour/editor_drag.cc
View file

@ -2377,9 +2377,14 @@ CursorDrag::fake_locate (framepos_t t)
Session* s = _editor->session ();
if (s->timecode_transmission_suspended ()) {
framepos_t const f = _editor->playhead_cursor->current_frame ();
/* This is asynchronous so it will be sent "now"
*/
s->send_mmc_locate (f);
s->send_full_time_code (f);
s->send_song_position_pointer (f);
/* These are synchronous and will be sent during the next
process cycle
*/
s->queue_full_time_code ();
s->queue_song_position_pointer ();
}
show_verbose_cursor_time (t);