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

Timeline: Avoid drawing fade curves when clipped or 0 width.

This commit is contained in:
Jonathan Moore Liles 2012-05-20 20:59:13 -07:00
parent fa5d739ac7
commit c370130d2b
1 changed files with 34 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
timeline/src/Audio_Region.C
View File

@ -362,18 +362,40 @@ Audio_Region::draw_fade ( const Fade &fade, Fade::fade_dir_e dir, bool line, int
const int height = dh; const int height = dh;
const int width = timeline->ts_to_x( fade.length ); const int width = timeline->ts_to_x( fade.length );
fl_push_matrix(); if ( ! width )
/* too small to draw */
return;
int fx;
if ( dir == Fade::In ) if ( dir == Fade::In )
fl_translate( line_x(), dy ); {
fx = line_x();
if ( fx + width < X ||
fx > X + W )
/* clipped */
return;
}
else else
{ {
fl_translate( line_x() + abs_w(), dy ); fx = line_x() + abs_w();
/* flip */
fl_scale( -1.0, 1.0 );
}
fl_scale( width, height ); if ( fx - width > X + W ||
fx < X )
/* clipped */
return;
}
fl_push_matrix();
fl_translate( fx, dy );
if ( dir == Fade::In )
fl_scale( width, height );
else
fl_scale( -width, height );
if ( line ) if ( line )
fl_begin_line(); fl_begin_line();
@ -390,7 +412,7 @@ Audio_Region::draw_fade ( const Fade &fade, Fade::fade_dir_e dir, bool line, int
nframes_t ts = 0; nframes_t ts = 0;
for ( int i = 0; i < width; ++i, ts += tsx ) for ( int i = 0; i < width; ++i, ts += tsx )
fl_vertex( i / (float)width, 1.0f - fade.gain( ts / (float)fade.length ) ); fl_vertex( i / (double)width, 1.0f - fade.gain( ts / (double)fade.length ) );
} }
@ -497,12 +519,12 @@ Audio_Region::draw ( void )
{ {
Fl_Color c = fl_color_average( FL_DARK1, Fl_Color c = fl_color_average( FL_DARK1,
Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color, Audio_Region::inherit_track_color ? sequence()->track()->color() : _box_color,
0.50f ); 0.50f );
fl_color( fl_color_add_alpha( c, 127 ) ); fl_color( fl_color_add_alpha( c, 127 ) );
draw_fade( _fade_in, Fade::In, false, W, W ); draw_fade( _fade_in, Fade::In, false, X, W );
draw_fade( _fade_out, Fade::Out, false, X, W ); draw_fade( _fade_out, Fade::Out, false, X, W );
} }