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

Get rid of duplicate :color field.

pull/3/head
Jonathan Moore Liles 2008-05-26 00:46:37 -05:00
parent 53876092f4
commit 3ef7b52ebc
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Timeline/Audio_Region.C
View File

@ -38,6 +38,8 @@
using std::min; using std::min;
using std::max; using std::max;
extern Timeline *timeline; extern Timeline *timeline;
bool Audio_Region::inherit_track_color = true; bool Audio_Region::inherit_track_color = true;
@ -46,6 +48,8 @@ Fl_Boxtype Audio_Region::_box = FL_UP_BOX;
Fl_Color Audio_Region::_selection_color = FL_MAGENTA; Fl_Color Audio_Region::_selection_color = FL_MAGENTA;
static Fl_Color fl_invert_color ( Fl_Color c ) static Fl_Color fl_invert_color ( Fl_Color c )
{ {
unsigned char r, g, b; unsigned char r, g, b;
@ -65,7 +69,6 @@ Audio_Region::get ( Log_Entry &e ) const
e.add( ":fade-in-duration", _fade_in.length ); e.add( ":fade-in-duration", _fade_in.length );
e.add( ":fade-out-type", _fade_out.type ); e.add( ":fade-out-type", _fade_out.type );
e.add( ":fade-out-duration", _fade_out.length ); e.add( ":fade-out-duration", _fade_out.length );
e.add( ":color", (int)_box_color );
Sequence_Region::get( e ); Sequence_Region::get( e );

2
Timeline/Sequence_Region.C
View File

@ -23,7 +23,7 @@
void void
Sequence_Region::get ( Log_Entry &e ) const Sequence_Region::get ( Log_Entry &e ) const
{ {
e.add( ":color", (int)_box_color ); e.add( ":color", _box_color );
e.add( ":length", _r->length ); e.add( ":length", _r->length );
Sequence_Widget::get( e ); Sequence_Widget::get( e );

5
Timeline/TLE.fl
View File

@ -152,7 +152,8 @@ asprintf( &path, "%s/options", user_config_dir );
free( path ); free( path );
menubar->add( "&Timeline", 0, 0, const_cast< Fl_Menu_Item *>( timeline->menu->menu() ), FL_SUBMENU_POINTER );} {} menubar->add( "&Timeline", 0, 0, const_cast< Fl_Menu_Item *>( timeline->menu->menu() ), FL_SUBMENU_POINTER );} {selected
}
} }
Function {make_window()} {open Function {make_window()} {open
} { } {
@ -706,7 +707,7 @@ xruns_output->value( engine->xruns() );} {}
xywh {0 213 497 392} xywh {0 213 497 392}
} { } {
Fl_Group {} { Fl_Group {} {
label Credits open selected label Credits open
xywh {2 237 492 362} xywh {2 237 492 362}
} { } {
Fl_Box {} { Fl_Box {} {