ardour/livetrax
13
0
Fork 0
Code

fix positioning of grid line after a non-beat aligned tempo change

Browse Source 
git-svn-id: svn://localhost/ardour2/branches/3.0@11182 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2012-01-07 02:44:41 +00:00
parent 6a154f9de6
commit ba00aba51c
1 changed files with 14 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libs/ardour/tempo.cc
View File

@ -951,8 +951,20 @@ TempoMap::_extend_map (TempoSection* tempo, MeterSection* meter,
tempo->set_frame (bar_start_frame +
llrint ((ts->bar_offset() * meter->divisions_per_bar() * beat_frames)));
/* advance to the location of the new (adjusted) beat */
current_frame += (ts->bar_offset() * beat_frames) + ((1.0 - ts->bar_offset()) * next_beat_frames);
/* advance to the location of
* the new (adjusted) beat. do
* this by figuring out the
* offset within the beat that
* would have been there
* without the tempo
* change. then stretch the
* beat accordingly.
*/
double offset_within_old_beat = (tempo->frame() - current_frame) / beat_frames;
current_frame += (offset_within_old_beat * beat_frames) + ((1.0 - offset_within_old_beat) * next_beat_frames);
/* next metric doesn't have to
* match this precisely to
* merit a reloop ...