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

Mixer: GUI Tweaks.

This commit is contained in:
Jonathan Moore Liles 2010-01-17 23:28:04 -06:00
parent 26a0ef1a27
commit 41d5f48441
2 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Mixer/Chain.C
View File

@ -154,6 +154,8 @@ Chain::Chain ( ) : Fl_Group( 0, 0, 100, 100, "")
{ Fl_Group *o = chain_tab = new Fl_Group( X, Y, W, H, "" ); { Fl_Group *o = chain_tab = new Fl_Group( X, Y, W, H, "" );
o->labeltype( FL_NO_LABEL ); o->labeltype( FL_NO_LABEL );
o->box( FL_FLAT_BOX ); o->box( FL_FLAT_BOX );
o->color( fl_darker( FL_GRAY ) );
// o->box( FL_NO_BOX );
{ Fl_Pack *o = modules_pack = new Fl_Pack( X, Y, W, H ); { Fl_Pack *o = modules_pack = new Fl_Pack( X, Y, W, H );
o->type( Fl_Pack::VERTICAL ); o->type( Fl_Pack::VERTICAL );
o->spacing( 10 ); o->spacing( 10 );
@ -162,6 +164,7 @@ Chain::Chain ( ) : Fl_Group( 0, 0, 100, 100, "")
o->end(); o->end();
} }
{ Fl_Group *o = control_tab = new Fl_Group( X, Y, W, H, "" ); { Fl_Group *o = control_tab = new Fl_Group( X, Y, W, H, "" );
o->box( FL_NO_BOX );
o->labeltype( FL_NO_LABEL ); o->labeltype( FL_NO_LABEL );
o->hide(); o->hide();
{ Fl_Scroll *o = new Fl_Scroll( X, Y, W, H ); { Fl_Scroll *o = new Fl_Scroll( X, Y, W, H );

20
Mixer/Mixer_Strip.C
View File

@ -290,7 +290,11 @@ Mixer_Strip::init ( )
chain_buffers = 0; chain_buffers = 0;
chain_buffer = NULL; chain_buffer = NULL;
box(FL_THIN_UP_BOX); // box(FL_THIN_UP_BOX);
box( FL_RFLAT_BOX );
Fl_Group::color( fl_darker( FL_BACKGROUND_COLOR ) );
clip_children( 1 ); clip_children( 1 );
Fl_Pack *gain_pack; Fl_Pack *gain_pack;
@ -361,6 +365,7 @@ Mixer_Strip::init ( )
Fl_Pack *fader_pack; Fl_Pack *fader_pack;
{ Fl_Group *o = fader_tab = new Fl_Group( 7, 115, 105, 330, "Fader" ); { Fl_Group *o = fader_tab = new Fl_Group( 7, 115, 105, 330, "Fader" );
o->box( FL_NO_BOX );
o->labeltype( FL_NO_LABEL ); o->labeltype( FL_NO_LABEL );
{ Fl_Pack* o = fader_pack = new Fl_Pack(7, 116, 103, 330 ); { Fl_Pack* o = fader_pack = new Fl_Pack(7, 116, 103, 330 );
o->spacing( 20 ); o->spacing( 20 );
@ -383,20 +388,22 @@ Mixer_Strip::init ( )
Fl_Group::current()->resizable(o); Fl_Group::current()->resizable(o);
} }
{ Fl_Group *o = signal_tab = new Fl_Group( 7, 115, 105, 330 ); { Fl_Group *o = signal_tab = new Fl_Group( 7, 115, 105, 330 );
o->box( FL_NO_BOX );
o->labeltype( FL_NO_LABEL ); o->labeltype( FL_NO_LABEL );
o->hide(); o->hide();
o->end(); o->end();
} }
{ Fl_Pack *o = panner_pack = new Fl_Pack( 2, 440, 114, 40 ); { Fl_Pack *o = panner_pack = new Fl_Pack( 2, 443, 114, 40 );
o->spacing( 2 ); o->spacing( 2 );
o->type( Fl_Pack::VERTICAL ); o->type( Fl_Pack::VERTICAL );
o->box( FL_NO_BOX );
#if 0
{ Fl_Box *o = new Fl_Box( 0, 0, 100, 24 ); { Fl_Box *o = new Fl_Box( 0, 0, 100, 24 );
o->align( (Fl_Align)(FL_ALIGN_BOTTOM | FL_ALIGN_INSIDE) ); o->align( (Fl_Align)(FL_ALIGN_BOTTOM | FL_ALIGN_INSIDE) );
o->labelsize( 10 ); o->labelsize( 10 );
o->label( "Pan" ); o->label( "Pan" );
} }
#if 0
{ Panner* o = new Panner(0, 0, 110, 90); { Panner* o = new Panner(0, 0, 110, 90);
o->box(FL_THIN_UP_BOX); o->box(FL_THIN_UP_BOX);
o->color(FL_GRAY0); o->color(FL_GRAY0);
@ -409,9 +416,14 @@ Mixer_Strip::init ( )
o->when(FL_WHEN_RELEASE); o->when(FL_WHEN_RELEASE);
} // Panner* o } // Panner* o
#endif #endif
{ Fl_Box *o = new Fl_Box( 0, 0, 100, 24 );
o->align( (Fl_Align)(FL_ALIGN_BOTTOM | FL_ALIGN_INSIDE) );
o->labelsize( 10 );
o->label( "Inputs" );
}
{ {
Controller_Module *m = jack_input_controller = new Controller_Module( true ); Controller_Module *m = jack_input_controller = new Controller_Module( true );
m->label( "Inputs" ); m->labeltype( FL_NO_LABEL );
m->chain( _chain ); m->chain( _chain );
m->pad( false ); m->pad( false );
// m->connect_to( &_chain->module( 0 )->control_input[1] ); // m->connect_to( &_chain->module( 0 )->control_input[1] );