Browse Source

Mixer/Mixer: Cleanup.

tags/non-daw-v1.1.0
Jonathan Moore Liles 15 years ago
parent
commit
f770cede45
2 changed files with 6 additions and 19 deletions
  1. +5
    -16
      mixer/src/Mixer.C
  2. +1
    -3
      mixer/src/Mixer.H

+ 5
- 16
mixer/src/Mixer.C View File

@@ -49,11 +49,11 @@ extern char *user_config_dir;


#include "debug.h" #include "debug.h"


static void update_cb( void *v ) {
Fl::repeat_timeout( STATUS_UPDATE_FREQ, update_cb, v );
/* static void update_cb( void *v ) { */
/* Fl::repeat_timeout( STATUS_UPDATE_FREQ, update_cb, v ); */


((Mixer*)v)->update();
}
/* ((Mixer*)v)->update(); */
/* } */




void Mixer::cb_menu(Fl_Widget* o) { void Mixer::cb_menu(Fl_Widget* o) {
@@ -309,7 +309,7 @@ void Mixer::add ( Mixer_Strip *ms )


rows( _rows ); rows( _rows );


scroll->redraw();
// scroll->redraw();
} }


void void
@@ -424,17 +424,6 @@ Mixer::rows ( int ideal_rows )
scroll->redraw(); scroll->redraw();
} }


void Mixer::update ( void )
{
THREAD_ASSERT( UI );

for ( int i = mixer_strips->children(); i--; )
{
((Mixer_Strip*)mixer_strips->child( i ))->update();
}
// redraw();
}

/** retrun a pointer to the track named /name/, or NULL if no track is named /name/ */ /** retrun a pointer to the track named /name/, or NULL if no track is named /name/ */
Mixer_Strip * Mixer_Strip *
Mixer::track_by_name ( const char *name ) Mixer::track_by_name ( const char *name )


+ 1
- 3
mixer/src/Mixer.H View File

@@ -63,14 +63,12 @@ protected:
int handle ( int m ); int handle ( int m );


public: public:
int min_h ( void ) const { return Mixer_Strip::min_h() + (18 * 2); } int min_h ( void ) const { return Mixer_Strip::min_h() + (18 * 2); }


void rows ( int n ); void rows ( int n );
virtual void resize ( int X, int Y, int W, int H ); virtual void resize ( int X, int Y, int W, int H );


void update ( void );

void new_strip ( void ); void new_strip ( void );
void process ( unsigned int nframes ); void process ( unsigned int nframes );
void add ( Mixer_Strip *ms ); void add ( Mixer_Strip *ms );


Loading…
Cancel
Save