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

Draw fade shapes on box layer and adjust waveform display to match.

This commit is contained in:
Jonathan Moore Liles 2008-04-14 05:00:08 -05:00
parent 8e02b99192
commit 26a8067d42
1 changed files with 52 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

86
Timeline/Region.C
View File

@ -422,6 +422,43 @@ Region::draw_box( int X, int Y, int W, int H )
else else
fl_draw_box( box(), x() - 10, y(), w() + 50, h(), _box_color ); fl_draw_box( box(), x() - 10, y(), w() + 50, h(), _box_color );
/* draw fades */
{
int dy = y() + Fl::box_dy( box() );
int dh = h() - Fl::box_dh( box() );
fl_color( fl_lighter( FL_BLACK ) );
fl_line_style( FL_SOLID, 2 );
Fade fade = _fade_in;
fade.length = 20000;
fade.type = Cosine;
fl_begin_polygon();
fl_vertex( x(), dy );
const int height = dh;
fl_vertex( x(), dy + height );
const int width = timeline->ts_to_x( fade.length );
for ( int i = X; i < line_x() + width; i += 3 )
{
const int x = i;
const int y = dy + (height * (1.0f - fade_gain( fade.type, timeline->x_to_ts( i - this->x() ), fade.length )));
fl_vertex( x, y );
}
fl_end_polygon();
fl_line_style( FL_SOLID, 0 );
}
fl_pop_clip(); fl_pop_clip();
} }
@ -478,6 +515,11 @@ Region::draw ( int X, int Y, int W, int H )
int ch = (h() - Fl::box_dh( box() )) / channels; int ch = (h() - Fl::box_dh( box() )) / channels;
/* FIXME: testing! */
Fade fade = _fade_in;
fade.length = 20000;
fade.type = Cosine;
for ( int i = 0; i < channels; ++i ) for ( int i = 0; i < channels; ++i )
{ {
Peak *pb = pbuf + (peaks * i); Peak *pb = pbuf + (peaks * i);
@ -489,6 +531,16 @@ Region::draw ( int X, int Y, int W, int H )
pb[ j ].max *= _scale; pb[ j ].max *= _scale;
} }
int fw = timeline->ts_to_x( fade.length );
/* if ( draw_fade_waveform ) */
for ( int j = min( fw, peaks ); j--; )
{
const float g = fade_gain( fade.type, j, fw );
pb[ j ].min *= g;
pb[ j ].max *= g;
}
Waveform::draw( X, (y() + Fl::box_dy( box() )) + (i * ch), W, ch, Waveform::draw( X, (y() + Fl::box_dy( box() )) + (i * ch), W, ch,
pb, peaks, pb, peaks,
selected() ? fl_invert_color( _color ) : _color ); selected() ? fl_invert_color( _color ) : _color );
@ -504,40 +556,6 @@ Region::draw ( int X, int Y, int W, int H )
/* draw fades */
{
fl_color( FL_BLACK );
fl_line_style( FL_SOLID, 2 );
Fade fade = _fade_in;
fade.length = 20000;
fade.type = Cosine;
fl_begin_line();
const int height = h();
const int width = timeline->ts_to_x( fade.length );
for ( int i = X; i < line_x() + width; i += 3 )
{
const int x = i;
const int y = this->y() + (height * (1.0f - fade_gain( fade.type, timeline->x_to_ts( i - this->x() ), fade.length )));
fl_vertex( x, y );
}
fl_end_line();
fl_line_style( FL_SOLID, 0 );
}
timeline->draw_measure_lines( rx, Y, rw, H, _box_color ); timeline->draw_measure_lines( rx, Y, rw, H, _box_color );