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

Don't waste time deinterleaving peaks.

This commit is contained in:
Jonathan Moore Liles 2008-04-17 11:12:22 -05:00
parent 9cbc39addd
commit 1b5459fe2b
4 changed files with 23 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Timeline/Audio_File.C
View File

@ -77,11 +77,13 @@ Audio_File::read_peaks( float fpp, nframes_t start, nframes_t end, int *peaks, P
*pbuf = new Peak[ *peaks * *channels ];
/* deintereave peaks */
int k = 0;
for ( int i = 0; i < *channels; i++ )
for ( int j = i; j < *peaks * *channels; j += *channels )
(*pbuf)[ k++ ] = pk.peakbuf()[ j ];
memcpy( *pbuf, pk.peakbuf(), *peaks * *channels * sizeof( Peak ) );
/* /\* deintereave peaks *\/ */
/* int k = 0; */
/* for ( int i = 0; i < *channels; i++ ) */
/* for ( int j = i; j < *peaks * *channels; j += *channels ) */
/* (*pbuf)[ k++ ] = pk.peakbuf()[ j ]; */
return true;
}

16
Timeline/Region.C
View File

@ -626,17 +626,19 @@ Region::draw ( void )
int ch = (h() - Fl::box_dh( box() )) / channels;
for ( int i = 0; i < channels; ++i )
{
Peak *pb = pbuf + (peaks * i);
/* scale it */
for ( int j = peaks; j--; )
for ( int j = peaks * channels; j--; )
{
pb[ j ].min *= _scale;
pb[ j ].max *= _scale;
pbuf[ j ].min *= _scale;
pbuf[ j ].max *= _scale;
}
for ( int i = 0; i < channels; ++i )
{
// Peak *pb = pbuf + (peaks * i);
/* int fw = timeline->ts_to_x( fade.length ); */
/* /\* if ( draw_fade_waveform ) *\/ */
@ -651,7 +653,7 @@ Region::draw ( void )
(y() + Fl::box_dy( box() )) + (i * ch),
W,
ch,
pb, peaks,
pbuf + i, peaks, channels,
selected() ? fl_invert_color( _color ) : _color );
}

8
Timeline/Waveform.C
View File

@ -43,7 +43,7 @@ bool Waveform::logarithmic = true;
/** draw a portion of /clip/'s waveform. coordinates are the portion to draw */
void
Waveform::draw ( int X, int Y, int W, int H,
Peak *pbuf, int peaks,
Peak *pbuf, int peaks, int skip,
Fl_Color color )
{
fl_push_clip( X, Y, W, H );
@ -62,7 +62,7 @@ Waveform::draw ( int X, int Y, int W, int H,
if ( Waveform::fill )
{
j = start;
for ( int x = X; x < X + W; ++x, ++j )
for ( int x = X; x < X + W; ++x, j += skip )
{
const Peak p = pbuf[ j ];
@ -106,7 +106,7 @@ Waveform::draw ( int X, int Y, int W, int H,
fl_begin_line();
j = start;
for ( int x = X; x < X + W; ++x, ++j )
for ( int x = X; x < X + W; ++x, j += skip )
{
const Peak p = pbuf[ j ];
@ -118,7 +118,7 @@ Waveform::draw ( int X, int Y, int W, int H,
fl_begin_line();
j = start;
for ( int x = X; x < X + W; ++x, ++j )
for ( int x = X; x < X + W; ++x, j += skip )
{
const Peak p = pbuf[ j ];

2
Timeline/Waveform.H
View File

@ -36,7 +36,7 @@ public:
static bool logarithmic;
static void draw ( int X, int Y, int W, int H,
Peak *pbuf, int peaks,
Peak *pbuf, int peaks, int skip,
Fl_Color color );
};