diff --git a/FL/menu_popup.H b/FL/menu_popup.H index 55f6257..67c5b78 100644 --- a/FL/menu_popup.H +++ b/FL/menu_popup.H @@ -18,7 +18,7 @@ /*******************************************************************************/ class Fl_Menu_; -class Fl_Menu_Item; +struct Fl_Menu_Item; class Fl_Widget; bool menu_popup ( Fl_Menu_ *m, int X, int Y ); diff --git a/timeline/src/Audio_Sequence.H b/timeline/src/Audio_Sequence.H index 8e5a410..f7beea6 100644 --- a/timeline/src/Audio_Sequence.H +++ b/timeline/src/Audio_Sequence.H @@ -53,7 +53,14 @@ public: Fl_Cursor cursor ( void ) const { return FL_CURSOR_DEFAULT; } - Sequence * clone_empty ( const char *name = 0 ) + virtual Sequence * clone_empty ( void ) + { + Audio_Sequence *t = new Audio_Sequence( track() ); + + return t; + } + + virtual Sequence * clone_empty ( const char *name ) { Audio_Sequence *t = new Audio_Sequence( track(), name ); diff --git a/timeline/src/Track.C b/timeline/src/Track.C index fbf9b10..a02049e 100644 --- a/timeline/src/Track.C +++ b/timeline/src/Track.C @@ -248,7 +248,7 @@ Track::set ( Log_Entry &e ) if ( ! strcmp( s, ":height" ) ) { size( atoi( v ) ); - resize(); + adjust_size(); } else if ( ! strcmp( s, ":selected" ) ) _selected = atoi( v ); @@ -444,7 +444,7 @@ static int pack_visible( Fl_Pack *p ) /* adjust size of widget and children */ void -Track::resize ( void ) +Track::adjust_size ( void ) { for ( int i = takes->children(); i--; ) takes->child( i )->size( w(), height() ); @@ -496,7 +496,7 @@ Track::size ( int v ) _size = v; - resize(); + adjust_size(); } void @@ -558,7 +558,7 @@ Track::remove ( Audio_Sequence *t ) timeline->unlock(); - resize(); + adjust_size(); update_take_menu(); } @@ -571,7 +571,7 @@ Track::remove ( Annotation_Sequence *t ) annotation->remove( t ); - resize(); + adjust_size(); } void @@ -590,7 +590,7 @@ Track::remove ( Control_Sequence *t ) timeline->unlock(); - resize(); + adjust_size(); } void @@ -609,7 +609,7 @@ Track::sequence ( Audio_Sequence * t ) update_take_menu(); - resize(); + adjust_size(); } void @@ -627,7 +627,7 @@ Track::add ( Control_Sequence *t ) engine->unlock(); - resize(); + adjust_size(); } void @@ -639,7 +639,7 @@ Track::add ( Annotation_Sequence *t ) annotation->add( t ); - resize(); + adjust_size(); } /** add all widget on this track falling within the given rectangle to diff --git a/timeline/src/Track.H b/timeline/src/Track.H index 5982b4f..ebde432 100644 --- a/timeline/src/Track.H +++ b/timeline/src/Track.H @@ -150,7 +150,7 @@ public: int ncontrols ( void ) { return control->children(); } - void resize ( void ); + void adjust_size ( void ); void size ( int v ); int height ( void ) const @@ -163,7 +163,7 @@ public: void show_all_takes ( bool b ) { _show_all_takes = b; - resize(); + adjust_size(); } void name ( const char *name ) diff --git a/timeline/src/Transport.H b/timeline/src/Transport.H index 563fa2d..30ead51 100644 --- a/timeline/src/Transport.H +++ b/timeline/src/Transport.H @@ -30,7 +30,7 @@ #include -struct Transport : public jack_position_t, public Fl_Pack +class Transport : public jack_position_t, public Fl_Pack { private: