diff --git a/Timeline/Audio_Region.C b/Timeline/Audio_Region.C index 1662df5..253c7e3 100644 --- a/Timeline/Audio_Region.C +++ b/Timeline/Audio_Region.C @@ -38,6 +38,8 @@ using std::min; using std::max; + + extern Timeline *timeline; 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; + + static Fl_Color fl_invert_color ( Fl_Color c ) { 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-out-type", _fade_out.type ); e.add( ":fade-out-duration", _fade_out.length ); - e.add( ":color", (int)_box_color ); Sequence_Region::get( e ); diff --git a/Timeline/Sequence_Region.C b/Timeline/Sequence_Region.C index ccf7f77..6e7cad6 100644 --- a/Timeline/Sequence_Region.C +++ b/Timeline/Sequence_Region.C @@ -23,7 +23,7 @@ void Sequence_Region::get ( Log_Entry &e ) const { - e.add( ":color", (int)_box_color ); + e.add( ":color", _box_color ); e.add( ":length", _r->length ); Sequence_Widget::get( e ); diff --git a/Timeline/TLE.fl b/Timeline/TLE.fl index 1364643..a4cb662 100644 --- a/Timeline/TLE.fl +++ b/Timeline/TLE.fl @@ -152,7 +152,8 @@ asprintf( &path, "%s/options", user_config_dir ); 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 } { @@ -706,7 +707,7 @@ xruns_output->value( engine->xruns() );} {} xywh {0 213 497 392} } { Fl_Group {} { - label Credits open selected + label Credits open xywh {2 237 492 362} } { Fl_Box {} {