|
@@ -565,8 +565,6 @@ Audio_Region::draw ( void ) |
|
|
int peaks; |
|
|
int peaks; |
|
|
Peak *pbuf = NULL; |
|
|
Peak *pbuf = NULL; |
|
|
|
|
|
|
|
|
// Fl_Color c = _color; |
|
|
|
|
|
|
|
|
|
|
|
do { |
|
|
do { |
|
|
|
|
|
|
|
|
nframes_t start = _r->offset; |
|
|
nframes_t start = _r->offset; |
|
@@ -642,6 +640,9 @@ Audio_Region::draw ( void ) |
|
|
// DMESSAGE( "using cached peaks" ); |
|
|
// DMESSAGE( "using cached peaks" ); |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
Fl_Color c = _color; |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// c = fl_color_average( FL_BLACK, FL_RED, 0.20 ); |
|
|
// c = fl_color_average( FL_BLACK, FL_RED, 0.20 ); |
|
|
|
|
|
|
|
|
if ( peaks && pbuf ) |
|
|
if ( peaks && pbuf ) |
|
@@ -667,12 +668,24 @@ Audio_Region::draw ( void ) |
|
|
|
|
|
|
|
|
xo += loop_peaks_needed; |
|
|
xo += loop_peaks_needed; |
|
|
|
|
|
|
|
|
c = fl_color_average( FL_GRAY, _color, 0.70 ); |
|
|
|
|
|
} |
|
|
} |
|
|
while ( _loop && xo < W ); |
|
|
while ( _loop && xo < W ); |
|
|
|
|
|
|
|
|
timeline->draw_measure_lines( X, Y, W, H ); |
|
|
timeline->draw_measure_lines( X, Y, W, H ); |
|
|
|
|
|
|
|
|
|
|
|
if ( _loop && offset < _loop ) |
|
|
|
|
|
{ |
|
|
|
|
|
const int lx = timeline->ts_to_x( _loop - offset ); |
|
|
|
|
|
|
|
|
|
|
|
if ( lx < X + W ) |
|
|
|
|
|
{ |
|
|
|
|
|
fl_color( FL_RED ); |
|
|
|
|
|
fl_line_style( FL_DASH, 0 ); |
|
|
|
|
|
fl_line( X + lx + 2, y(), X + lx + 2, y() + h() ); |
|
|
|
|
|
fl_line_style( FL_SOLID, 0 ); |
|
|
|
|
|
} |
|
|
|
|
|
} |
|
|
|
|
|
|
|
|
if ( _adjusting_gain ) |
|
|
if ( _adjusting_gain ) |
|
|
{ |
|
|
{ |
|
|
fl_color( fl_color_add_alpha( FL_DARK1, 127 ) ); |
|
|
fl_color( fl_color_add_alpha( FL_DARK1, 127 ) ); |
|
|