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

Cleanups. Move waveform scaling into Waveform class.

This commit is contained in:
Jonathan Moore Liles 2008-05-18 19:42:27 -05:00
parent 8d7bee3050
commit d40bc52a5a
3 changed files with 15 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Timeline/Audio_Region.C
View File

@ -597,13 +597,7 @@ Audio_Region::draw ( void )
int ch = (h() - Fl::box_dh( box() )) / channels; int ch = (h() - Fl::box_dh( box() )) / channels;
Waveform::scale( pbuf, peaks * channels, _scale );
/* scale it */
for ( int j = peaks * channels; j--; )
{
pbuf[ j ].min *= _scale;
pbuf[ j ].max *= _scale;
}
for ( int i = 0; i < channels; ++i ) for ( int i = 0; i < channels; ++i )

38
Timeline/Waveform.C
View File

@ -41,20 +41,26 @@ bool Waveform::logarithmic = true;
/* TODO: split the variations into separate functions. eg, plain, /* TODO: split the variations into separate functions. eg, plain,
* outlined, filled, polygonal, rectified. */ * outlined, filled, polygonal, rectified. */
/* TODO: this should be made completely independent of /timeline/ so that it can be used for other purposes (file previews) */
void
Waveform::scale ( Peak *pbuf, int npeaks, float gain )
{
/* scale it */
for ( int j = npeaks; j--; )
{
pbuf[ j ].min *= gain;
pbuf[ j ].max *= gain;
}
}
/** draw a portion of /clip/'s waveform. coordinates are the portion to draw */ /** draw a portion of /clip/'s waveform. coordinates are the portion to draw */
void void
Waveform::draw ( int X, int Y, int W, int H, Waveform::draw ( int X, int Y, int W, int H,
Peak *pbuf, int peaks, int skip, const Peak *pbuf, int peaks, int skip,
Fl_Color color ) Fl_Color color )
{ {
// fl_push_clip( X, Y, W, H );
int j; int j;
// int start = timeline->ts_to_x( _r->start ) + (X - ox);
int start = 0; int start = 0;
const int halfheight = H / 2; const int halfheight = H / 2;
@ -71,17 +77,10 @@ Waveform::draw ( int X, int Y, int W, int H,
const float diff = fabs( p.max - p.min ); const float diff = fabs( p.max - p.min );
/* if ( Waveform::logarithmic ) */
/* { */
/* p.max = 10.0f * log10f( p.max ); */
/* p.min = 10.0f * log10f( p.min ); */
/* } */
if ( diff > 2.0f ) if ( diff > 2.0f )
fl_color( FL_RED ); fl_color( FL_RED );
else else
if ( Waveform::vary_color ) if ( Waveform::vary_color )
// fl_color( fl_color_average( FL_WHITE, color, diff / 2.0f ) );
fl_color( fl_color_average( FL_WHITE, color, diff * 0.5f ) ); fl_color( fl_color_average( FL_WHITE, color, diff * 0.5f ) );
else else
fl_color( color ); fl_color( color );
@ -89,14 +88,6 @@ Waveform::draw ( int X, int Y, int W, int H,
const int ty = mid - ( halfheight * p.min ); const int ty = mid - ( halfheight * p.min );
const int by = mid - ( halfheight * p.max ); const int by = mid - ( halfheight * p.max );
fl_line( x, ty, x, by ); fl_line( x, ty, x, by );
/* if ( outline ) */
/* { */
/* fl_color( fl_darker( fl_darker( color ) ) ); */
/* fl_line( x, ty - 2, x, ty ); */
/* fl_line( x, by + 2, x, by ); */
/* } */
} }
} }
@ -104,11 +95,9 @@ Waveform::draw ( int X, int Y, int W, int H,
if ( Waveform::outline ) if ( Waveform::outline )
{ {
fl_color( fl_darker( fl_darker( color ) ) ); fl_color( fl_darker( fl_darker( color ) ) );
fl_line_style( FL_SOLID | FL_CAP_FLAT, 2 ); fl_line_style( FL_SOLID | FL_CAP_FLAT, 2 );
// fl_line_style( FL_SOLID, 0 );
fl_begin_line(); fl_begin_line();
@ -129,8 +118,5 @@ Waveform::draw ( int X, int Y, int W, int H,
fl_end_line(); fl_end_line();
fl_line_style( FL_SOLID, 0 ); fl_line_style( FL_SOLID, 0 );
} }
// fl_pop_clip();
} }

3
Timeline/Waveform.H
View File

@ -35,8 +35,9 @@ public:
static bool vary_color; static bool vary_color;
static bool logarithmic; static bool logarithmic;
static void scale ( Peak *pbuf, int npeaks, float gain );
static void draw ( int X, int Y, int W, int H, static void draw ( int X, int Y, int W, int H,
Peak *pbuf, int peaks, int skip, const Peak *pbuf, int peaks, int skip,
Fl_Color color ); Fl_Color color );
}; };