mirrors
/
non
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Make time points reset the beat count.

This commit is contained in:
Jonathan Moore Liles 2008-05-14 18:47:28 -05:00
parent 705482f72f
commit d6e8ec3c4a
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Timeline/Timeline.C
View File

@ -366,6 +366,7 @@ const float ticks_per_beat = 1920.0;
void void
Timeline::update_tempomap ( void ) Timeline::update_tempomap ( void )
{ {
/* FIXME: we need some type of locking! */
_tempomap.clear(); _tempomap.clear();
for ( list <Sequence_Widget *>::const_iterator i = time_track->_widgets.begin(); for ( list <Sequence_Widget *>::const_iterator i = time_track->_widgets.begin();
@ -387,11 +388,11 @@ Timeline::solve_tempomap ( nframes_t frame ) const
return render_tempomap( frame, 0, 0, 0 ); return render_tempomap( frame, 0, 0, 0 );
} }
/* THREAD: UI and RT */
/** draw appropriate measure lines inside the given bounding box */ /** draw appropriate measure lines inside the given bounding box */
position_info position_info
Timeline::render_tempomap( nframes_t start, nframes_t length, measure_line_callback * cb, void *arg ) const Timeline::render_tempomap( nframes_t start, nframes_t length, measure_line_callback * cb, void *arg ) const
{ {
const nframes_t end = start + length; const nframes_t end = start + length;
position_info pos; position_info pos;
@ -431,6 +432,9 @@ Timeline::render_tempomap( nframes_t start, nframes_t length, measure_line_callb
const Time_Point *p = (Time_Point*)(*i); const Time_Point *p = (Time_Point*)(*i);
sig = p->time(); sig = p->time();
/* Time point resets beat */
bbt.beat = 0;
} }
{ {