Browse Source

Mixer: Explicitly destroy chian when tearing down mixer strip.

tags/non-daw-v1.1.0
Jonathan Moore Liles 15 years ago
parent
commit
3e929e4b98
3 changed files with 6 additions and 11 deletions
  1. +1
    -1
      Mixer/Mixer.H
  2. +4
    -3
      Mixer/Mixer_Strip.C
  3. +1
    -7
      Mixer/Mixer_Strip.H

+ 1
- 1
Mixer/Mixer.H View File

@@ -46,8 +46,8 @@ private:


Fl_Scroll *scroll; Fl_Scroll *scroll;
Fl_Pack *pack; Fl_Pack *pack;
Fl_Flowpack *mixer_strips;


Fl_Flowpack *mixer_strips;


protected: protected:




+ 4
- 3
Mixer/Mixer_Strip.C View File

@@ -177,6 +177,10 @@ Mixer_Strip::Mixer_Strip() : Fl_Group( 0, 0, 120, 600 )
Mixer_Strip::~Mixer_Strip ( ) Mixer_Strip::~Mixer_Strip ( )
{ {
DMESSAGE( "Destroying mixer strip" ); DMESSAGE( "Destroying mixer strip" );

delete _chain;
_chain = NULL;

log_destroy(); log_destroy();
} }


@@ -288,9 +292,6 @@ Mixer_Strip::init ( )
{ {
_chain = 0; _chain = 0;


chain_buffers = 0;
chain_buffer = NULL;

// box(FL_THIN_UP_BOX); // box(FL_THIN_UP_BOX);
box( FL_RFLAT_BOX ); box( FL_RFLAT_BOX );




+ 1
- 7
Mixer/Mixer_Strip.H View File

@@ -55,8 +55,7 @@ public:
Mixer_Strip(int X, int Y, int W, int H, const char *L = 0); Mixer_Strip(int X, int Y, int W, int H, const char *L = 0);
Mixer_Strip( const char *name, int channels ); Mixer_Strip( const char *name, int channels );
Mixer_Strip(); /* for log create */ Mixer_Strip(); /* for log create */
~Mixer_Strip();

virtual ~Mixer_Strip();


void chain ( Chain *c ); void chain ( Chain *c );


@@ -101,14 +100,9 @@ private:
Controller_Module *jack_input_controller; Controller_Module *jack_input_controller;
Meter_Indicator_Module *meter_indicator; Meter_Indicator_Module *meter_indicator;


sample_t **chain_buffer;
int chain_buffers;

nframes_t nframes; nframes_t nframes;



Fl_Color _color; Fl_Color _color;
// unsigned _color;


void init ( ); void init ( );
void cb_handle(Fl_Widget*); void cb_handle(Fl_Widget*);


Loading…
Cancel
Save