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

Timeline: Always draw waveforms using theme foreground color.

This commit is contained in:
Jonathan Moore Liles 2012-06-06 23:45:07 -07:00
parent f3505a84de
commit 183764e767
1 changed files with 4 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
timeline/src/Audio_Region.C
View File

@ -94,8 +94,6 @@ Audio_Region::set ( Log_Entry &e )
if ( ! strcmp( s, ":gain" ) ) if ( ! strcmp( s, ":gain" ) )
_scale = atof( v ); _scale = atof( v );
else if ( ! strcmp( s, ":color" ) )
_box_color = (Fl_Color)atoi( v );
else if ( ! strcmp( s, ":fade-in-type" ) ) else if ( ! strcmp( s, ":fade-in-type" ) )
_fade_in.type = (Fade::fade_type_e)atoi( v ); _fade_in.type = (Fade::fade_type_e)atoi( v );
else if ( ! strcmp( s, ":fade-in-duration" ) ) else if ( ! strcmp( s, ":fade-in-duration" ) )
@ -129,8 +127,8 @@ Audio_Region::init ( void )
_scale = 1.0f; _scale = 1.0f;
_clip = NULL; _clip = NULL;
_box_color = FL_CYAN; _color = FL_FOREGROUND_COLOR;
_color = FL_BLUE; _box_color = FL_GRAY;
_fade_in.length = 256; _fade_in.length = 256;
_fade_in.type = Fade::Sigmoid; _fade_in.type = Fade::Sigmoid;
@ -192,13 +190,7 @@ Audio_Region::Audio_Region ( Audio_File *c, Sequence *t, nframes_t o )
while ( sum >> 8 ) while ( sum >> 8 )
sum = (sum & 0xFF) + (sum >> 8); sum = (sum & 0xFF) + (sum >> 8);
_color = (Fl_Color)sum; _box_color = (Fl_Color)sum;
/* _color = fl_color_average( FL_YELLOW, (Fl_Color)sum, 0.80 ); */
// _color = FL_YELLOW;
_box_color = FL_WHITE;
log_create(); log_create();
} }
@ -485,6 +477,7 @@ Audio_Region::draw_box( void )
void void
Audio_Region::peaks_ready_callback ( void *v ) Audio_Region::peaks_ready_callback ( void *v )
{ {
DMESSAGE("Damaging region from peaks ready callback");
Fl::lock(); Fl::lock();
((Audio_Region*)v)->redraw(); ((Audio_Region*)v)->redraw();
Fl::unlock(); Fl::unlock();