Browse Source

Get rid of duplicate :color field.

tags/non-daw-v1.1.0
Jonathan Moore Liles 17 years ago
parent
commit
3ef7b52ebc
3 changed files with 8 additions and 4 deletions
  1. +4
    -1
      Timeline/Audio_Region.C
  2. +1
    -1
      Timeline/Sequence_Region.C
  3. +3
    -2
      Timeline/TLE.fl

+ 4
- 1
Timeline/Audio_Region.C View File

@@ -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 );



+ 1
- 1
Timeline/Sequence_Region.C View File

@@ -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 );


+ 3
- 2
Timeline/TLE.fl View File

@@ -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 {} {


Loading…
Cancel
Save