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

Fix some clang warnings.

pull/3/head
Jonathan Moore Liles 2012-05-30 22:58:35 -07:00
parent a8a5638f6a
commit 3e73817155
5 changed files with 21 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
FL/menu_popup.H
View File

@ -18,7 +18,7 @@
/*******************************************************************************/ /*******************************************************************************/
class Fl_Menu_; class Fl_Menu_;
class Fl_Menu_Item; struct Fl_Menu_Item;
class Fl_Widget; class Fl_Widget;
bool menu_popup ( Fl_Menu_ *m, int X, int Y ); bool menu_popup ( Fl_Menu_ *m, int X, int Y );

9
timeline/src/Audio_Sequence.H
View File

@ -53,7 +53,14 @@ public:
Fl_Cursor cursor ( void ) const { return FL_CURSOR_DEFAULT; } 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 ); Audio_Sequence *t = new Audio_Sequence( track(), name );

18
timeline/src/Track.C
View File

@ -248,7 +248,7 @@ Track::set ( Log_Entry &e )
if ( ! strcmp( s, ":height" ) ) if ( ! strcmp( s, ":height" ) )
{ {
size( atoi( v ) ); size( atoi( v ) );
resize(); adjust_size();
} }
else if ( ! strcmp( s, ":selected" ) ) else if ( ! strcmp( s, ":selected" ) )
_selected = atoi( v ); _selected = atoi( v );
@ -444,7 +444,7 @@ static int pack_visible( Fl_Pack *p )
/* adjust size of widget and children */ /* adjust size of widget and children */
void void
Track::resize ( void ) Track::adjust_size ( void )
{ {
for ( int i = takes->children(); i--; ) for ( int i = takes->children(); i--; )
takes->child( i )->size( w(), height() ); takes->child( i )->size( w(), height() );
@ -496,7 +496,7 @@ Track::size ( int v )
_size = v; _size = v;
resize(); adjust_size();
} }
void void
@ -558,7 +558,7 @@ Track::remove ( Audio_Sequence *t )
timeline->unlock(); timeline->unlock();
resize(); adjust_size();
update_take_menu(); update_take_menu();
} }
@ -571,7 +571,7 @@ Track::remove ( Annotation_Sequence *t )
annotation->remove( t ); annotation->remove( t );
resize(); adjust_size();
} }
void void
@ -590,7 +590,7 @@ Track::remove ( Control_Sequence *t )
timeline->unlock(); timeline->unlock();
resize(); adjust_size();
} }
void void
@ -609,7 +609,7 @@ Track::sequence ( Audio_Sequence * t )
update_take_menu(); update_take_menu();
resize(); adjust_size();
} }
void void
@ -627,7 +627,7 @@ Track::add ( Control_Sequence *t )
engine->unlock(); engine->unlock();
resize(); adjust_size();
} }
void void
@ -639,7 +639,7 @@ Track::add ( Annotation_Sequence *t )
annotation->add( t ); annotation->add( t );
resize(); adjust_size();
} }
/** add all widget on this track falling within the given rectangle to /** add all widget on this track falling within the given rectangle to

4
timeline/src/Track.H
View File

@ -150,7 +150,7 @@ public:
int ncontrols ( void ) { return control->children(); } int ncontrols ( void ) { return control->children(); }
void resize ( void ); void adjust_size ( void );
void size ( int v ); void size ( int v );
int height ( void ) const int height ( void ) const
@ -163,7 +163,7 @@ public:
void show_all_takes ( bool b ) void show_all_takes ( bool b )
{ {
_show_all_takes = b; _show_all_takes = b;
resize(); adjust_size();
} }
void name ( const char *name ) void name ( const char *name )

2
timeline/src/Transport.H
View File

@ -30,7 +30,7 @@
#include <stdio.h> #include <stdio.h>
struct Transport : public jack_position_t, public Fl_Pack class Transport : public jack_position_t, public Fl_Pack
{ {
private: private: