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

Mixer: Clean up strip layout.

pull/52/head
Jonathan Moore Liles 2013-04-10 19:23:35 -07:00
parent b531769184
commit cbf7df0e0d
3 changed files with 17 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mixer/src/Controller_Module.C
View File

@ -281,7 +281,7 @@ Controller_Module::connect_spatializer_to ( Module *m )
o->labelcolor(FL_FOREGROUND_COLOR); o->labelcolor(FL_FOREGROUND_COLOR);
o->align(FL_ALIGN_TOP); o->align(FL_ALIGN_TOP);
o->when(FL_WHEN_CHANGED); o->when(FL_WHEN_CHANGED);
o->label( "Spatialization" ); label( "Spatialization" );
o->align(FL_ALIGN_TOP); o->align(FL_ALIGN_TOP);
o->labelsize( 10 ); o->labelsize( 10 );

27
mixer/src/Mixer_Strip.C
View File

@ -303,10 +303,12 @@ Mixer_Strip::set_spatializer_visibility ( void )
if ( fader_tab->visible() && spatialization_controller->is_controlling() ) if ( fader_tab->visible() && spatialization_controller->is_controlling() )
{ {
spatialization_controller->show(); spatialization_controller->show();
spatialization_label->show();
} }
else else
{ {
spatialization_controller->hide(); spatialization_controller->hide();
spatialization_label->hide();
} }
} }
@ -471,7 +473,7 @@ Mixer_Strip::init ( )
o->resizable(0); o->resizable(0);
o->end(); o->end();
} }
{ Fl_Scalepack* o = new Fl_Scalepack(2, 135, 105, 315 ); { Fl_Scalepack* o = new Fl_Scalepack(2, 135, 105, 311 );
// o->box( FL_BORDER_BOX ); // o->box( FL_BORDER_BOX );
// o->color( FL_RED ); // o->color( FL_RED );
o->spacing( 20 ); o->spacing( 20 );
@ -505,17 +507,18 @@ 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 = spatialization_label = 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->hide();
} o->label( "Spatialization" );
{ Controller_Module *o = spatialization_controller = new Controller_Module( true ); }
o->hide(); { Controller_Module *o = spatialization_controller = new Controller_Module( true );
o->pad( false ); o->hide();
o->size( 100, 100 ); o->label( 0 );
} o->pad( false );
o->size( 100, 100 );
}
/* o->end(); */ /* o->end(); */
/* } */ /* } */
o->end(); o->end();

1
mixer/src/Mixer_Strip.H
View File

@ -103,6 +103,7 @@ private:
Chain *_chain; Chain *_chain;
Fl_Box *spatialization_label;
Controller_Module *gain_controller; Controller_Module *gain_controller;
Controller_Module *jack_input_controller; Controller_Module *jack_input_controller;
Controller_Module *spatialization_controller; Controller_Module *spatialization_controller;