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

Minor fixes.

This commit is contained in:
Jonathan Moore Liles 2008-03-01 09:25:27 -06:00
parent 0155831e34
commit c9926362a7
3 changed files with 27 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
Region.C
View File

@ -94,12 +94,14 @@ Region::init ( void )
/* copy constructor */ /* copy constructor */
Region::Region ( const Region & rhs ) Region::Region ( const Region & rhs )
{ {
_offset = rhs._offset; _offset = rhs._offset;
_track = rhs._track; _track = rhs._track;
_clip = rhs._clip; _clip = rhs._clip;
_start = rhs._start; _start = rhs._start;
_end = rhs._end; _end = rhs._end;
_scale = rhs._scale; _scale = rhs._scale;
_box_color = rhs._box_color;
_color = rhs._color;
log_create(); log_create();
} }
@ -126,6 +128,22 @@ Region::Region ( Audio_File *c, Track *t, nframes_t o )
_track->add( this ); _track->add( this );
int sum = 0;
const char *s = rindex( _clip->name(), '/' );
for ( int i = strlen( s ); i--; )
sum += s[ i ];
while ( sum >> 8 )
sum = (sum & 0xFF) + (sum >> 8);
_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();
} }
@ -431,7 +449,7 @@ Region::draw ( int X, int Y, int W, int H )
// _scale, _selected ? _color : fl_invert_color( _color ) ); // _scale, _selected ? _color : fl_invert_color( _color ) );
draw_waveform( rx, X, (y() + Fl::box_dy( box() )) + (i * ch), W, ch, _clip, i, draw_waveform( rx, X, (y() + Fl::box_dy( box() )) + (i * ch), W, ch, _clip, i,
_start + offset, min( (_end - _start) - offset, _end), _start + offset, min( (_end - _start) - offset, _end),
_scale, _selected ? _color : fl_invert_color( _color ) ); _scale, _selected ? fl_invert_color( _color ) : _color );
timeline->draw_measure_lines( rx, Y, rw, H, _box_color ); timeline->draw_measure_lines( rx, Y, rw, H, _box_color );

2
Track_Header.C
View File

@ -46,7 +46,7 @@ Track_Header::Track_Header ( int X, int Y, int W, int H, const char *L ) :
_name = NULL; _name = NULL;
_track = NULL; _track = NULL;
_selected = false; _selected = false;
_size = 3; _size = 1;
Fl_Group::size( w(), height() ); Fl_Group::size( w(), height() );

2
Waveform.C
View File

@ -58,7 +58,7 @@ draw_waveform ( int ox, int X, int Y, int W, int H, Audio_File *_clip, int chann
p.min *= _scale; p.min *= _scale;
// FIXME: cache this stuff. // FIXME: cache this stuff.
fl_color( fl_color_average( FL_RED, color, fabs( p.max - p.min ) ) ); fl_color( fl_color_average( FL_RED, color, fabs( p.max - p.min ) - 1.0 ) );
if ( p.min < -1.0 || p.max > 1.0 ) if ( p.min < -1.0 || p.max > 1.0 )
fl_color( FL_RED ); fl_color( FL_RED );