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

Oops. Fix draw_measure's use of renamed sequence widget properties.

This commit is contained in:
Jonathan Moore Liles 2008-05-12 10:14:35 -05:00
parent 4cb8fbd22d
commit f41f23c306
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Timeline/Timeline.C
View File

@ -357,7 +357,7 @@ Timeline::draw_measure ( nframes_t when, int Y, int W, int H, Fl_Color color, me
for ( list <Sequence_Widget *>::const_reverse_iterator i = tempo_track->_widgets.rbegin(); for ( list <Sequence_Widget *>::const_reverse_iterator i = tempo_track->_widgets.rbegin();
i != tempo_track->_widgets.rend(); i++ ) i != tempo_track->_widgets.rend(); i++ )
if ( (*i)->offset() <= when ) if ( (*i)->start() <= when )
{ {
tpi = i.base(); tpi = i.base();
break; break;
@ -365,7 +365,7 @@ Timeline::draw_measure ( nframes_t when, int Y, int W, int H, Fl_Color color, me
for ( list <Sequence_Widget *>::const_reverse_iterator i = time_track->_widgets.rbegin(); for ( list <Sequence_Widget *>::const_reverse_iterator i = time_track->_widgets.rbegin();
i != time_track->_widgets.rend(); i++ ) i != time_track->_widgets.rend(); i++ )
if ( (*i)->offset() <= when ) if ( (*i)->start() <= when )
{ {
mpi = i.base(); mpi = i.base();
break; break;
@ -378,17 +378,17 @@ Timeline::draw_measure ( nframes_t when, int Y, int W, int H, Fl_Color color, me
const Tempo_Point *tp = (Tempo_Point*)(*tpi); const Tempo_Point *tp = (Tempo_Point*)(*tpi);
nframes_t beat_inc = samples_per_minute / tp->tempo(); nframes_t beat_inc = samples_per_minute / tp->tempo();
nframes_t f = when - ( ( when - tp->offset() ) % beat_inc ); nframes_t f = when - ( ( when - tp->start() ) % beat_inc );
for ( ; tpi != tempo_track->_widgets.end(); ++tpi ) for ( ; tpi != tempo_track->_widgets.end(); ++tpi )
{ {
list <Sequence_Widget*>::const_iterator ntpi = tpi; list <Sequence_Widget*>::const_iterator ntpi = tpi;
++ntpi; ++ntpi;
tp = (Tempo_Point*)(*tpi);
const Tempo_Point *ntp = ntpi == tempo_track->_widgets.end() ? NULL : (Tempo_Point*)(*ntpi); const Tempo_Point *ntp = ntpi == tempo_track->_widgets.end() ? NULL : (Tempo_Point*)(*ntpi);
const nframes_t ntpo = ntp ? ntp->offset() : when + x_to_ts( W + 1 ); tp = (Tempo_Point*)(*tpi);
const nframes_t ntpo = ntp ? ntp->start() : when + x_to_ts( W + 1 );
beat_inc = samples_per_minute / tp->tempo(); beat_inc = samples_per_minute / tp->tempo();