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

Fix error in waveform coloring.

pull/3/head
Jonathan Moore Liles 2008-03-08 11:17:35 -06:00
parent f6d5123e35
commit 8d31a880b3
1 changed files with 11 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
Waveform.C
View File

@ -56,23 +56,25 @@ draw_waveform ( int ox, int X, int Y, int W, int H, Audio_File *_clip, int chann
int mid = Y + (H / 2); int mid = Y + (H / 2);
p.max *= _scale; p.max *= _scale;
p.min *= _scale; p.min *= _scale;
if ( vary_color ) if ( vary_color )
fl_color( fl_color_average( FL_RED, color, fabs( p.max - p.min ) - 1.0 ) ); fl_color( fl_color_average( FL_RED, color, min( 1.0, fabs( p.max - p.min ) ) ) );
else else
fl_color( color ); fl_color( color );
/* p.min = max( p.min, -1.0f ); */
/* p.max = min( p.max, 1.0f ); */
if ( p.min < -1.0 || p.max > 1.0 ) /* if ( p.min < -1.0 || p.max > 1.0 ) */
{ /* { */
fl_color( FL_RED ); /* fl_color( FL_RED ); */
fl_line( x, Y, x, Y + H ); /* fl_line( x, Y, x, Y + H ); */
} /* } */
else /* else */
fl_line( x, mid + (H / 2 * p.min), x, mid + (H / 2 * p.max) );
fl_line( x, mid + (H / 2 * p.min), x, mid + (H / 2 * p.max) );
} }