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

Mixer: Move inputs control.

This commit is contained in:
Jonathan Moore Liles 2013-04-10 19:16:59 -07:00
parent ffcf1454d5
commit b531769184
1 changed files with 26 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
mixer/src/Mixer_Strip.C
View File

@ -439,7 +439,8 @@ Mixer_Strip::init ( )
} // Fl_Button* o } // Fl_Button* o
o->end(); o->end();
} // Fl_Group* o } // Fl_Group* o
{ Fl_Flip_Button* o = tab_button = new Fl_Flip_Button(61, 183, 45, 22, "fader/signal"); { Fl_Flip_Button* o = tab_button = new Fl_Flip_Button(61, 183, 45, 22, "fader/signal");
o->type(1); o->type(1);
o->labelsize( 14 ); o->labelsize( 14 );
@ -458,7 +459,19 @@ Mixer_Strip::init ( )
{ Fl_Group *o = fader_tab = new Fl_Group( 2, 116, 105, 330, "Fader" ); { Fl_Group *o = fader_tab = new Fl_Group( 2, 116, 105, 330, "Fader" );
o->box( FL_NO_BOX ); o->box( FL_NO_BOX );
o->labeltype( FL_NO_LABEL ); o->labeltype( FL_NO_LABEL );
{ Fl_Scalepack* o = new Fl_Scalepack(2, 116, 105, 330 ); { Fl_Pack *o = new Fl_Pack( 2, 116, 105, 15 );
o->type( FL_VERTICAL );
{
Controller_Module *m = jack_input_controller = new Controller_Module( true );
m->labeltype( FL_NO_LABEL );
m->chain( _chain );
m->pad( false );
m->size( 105, 15 );
}
o->resizable(0);
o->end();
}
{ Fl_Scalepack* o = new Fl_Scalepack(2, 135, 105, 315 );
// o->box( FL_BORDER_BOX ); // o->box( FL_BORDER_BOX );
// o->color( FL_RED ); // o->color( FL_RED );
o->spacing( 20 ); o->spacing( 20 );
@ -467,6 +480,7 @@ Mixer_Strip::init ( )
o->pad( false ); o->pad( false );
o->size( 33, 100 ); o->size( 33, 100 );
} }
{ Meter_Indicator_Module *o = meter_indicator = new Meter_Indicator_Module( true ); { Meter_Indicator_Module *o = meter_indicator = new Meter_Indicator_Module( true );
o->disable_context_menu( true ); o->disable_context_menu( true );
o->pad( false ); o->pad( false );
@ -491,28 +505,17 @@ Mixer_Strip::init ( )
/* { Fl_Pack *o = panner_pack = new Fl_Pack( 2, 465, 114, 40 ); */ /* { Fl_Pack *o = panner_pack = new Fl_Pack( 2, 465, 114, 40 ); */
/* o->spacing( 2 ); */ /* o->spacing( 2 ); */
/* o->type( Fl_Pack::VERTICAL ); */ /* o->type( Fl_Pack::VERTICAL ); */
{ Fl_Box *o = new Fl_Box( 0, 0, 100, 12 ); { Fl_Box *o = new Fl_Box( 0, 0, 100, 12 );
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( "Spatialization" ); // o->label( "Spatialization" );
} }
{ Controller_Module *o = spatialization_controller = new Controller_Module( true ); { Controller_Module *o = spatialization_controller = new Controller_Module( true );
o->hide(); o->hide();
o->pad( false ); o->pad( false );
o->size( 100, 100 ); o->size( 100, 100 );
} }
{ Fl_Box *o = new Fl_Box( 0, 0, 100, 12 );
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 );
m->labeltype( FL_NO_LABEL );
m->chain( _chain );
m->pad( false );
m->size( 33, 24 );
}
/* o->end(); */ /* o->end(); */
/* } */ /* } */
o->end(); o->end();