Browse Source

Fix some clang warnings.

tags/non-daw-v1.2.0
Jonathan Moore Liles 10 years ago
parent
commit
3e73817155
5 changed files with 21 additions and 14 deletions
  1. +1
    -1
      FL/menu_popup.H
  2. +8
    -1
      timeline/src/Audio_Sequence.H
  3. +9
    -9
      timeline/src/Track.C
  4. +2
    -2
      timeline/src/Track.H
  5. +1
    -1
      timeline/src/Transport.H

+ 1
- 1
FL/menu_popup.H View File

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


+ 8
- 1
timeline/src/Audio_Sequence.H View File

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



+ 9
- 9
timeline/src/Track.C View File

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


+ 2
- 2
timeline/src/Track.H View File

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


+ 1
- 1
timeline/src/Transport.H View File

@@ -30,7 +30,7 @@

#include <stdio.h>

struct Transport : public jack_position_t, public Fl_Pack
class Transport : public jack_position_t, public Fl_Pack
{

private:


Loading…
Cancel
Save