Mixer/Panner: Add 3 meter range setting.

This commit is contained in:
Jonathan Moore Liles 2013-10-04 18:10:30 -07:00
parent 3628f08fbc
commit 1b3994a5f1
2 changed files with 6 additions and 5 deletions

View File

@ -44,7 +44,7 @@ Panner::Panner ( int X, int Y, int W, int H, const char *L ) :
// _projection = POLAR; // _projection = POLAR;
_points.push_back( Point( 1, 0 ) ); _points.push_back( Point( 1, 0 ) );
static int ranges[] = { 1,5,10,15 }; static float ranges[] = { 1,3,5,10,15 };
{ Fl_Choice *o = _range_choice = new Fl_Choice(X + 40,Y + H - 18,75,18,"Range:"); { Fl_Choice *o = _range_choice = new Fl_Choice(X + 40,Y + H - 18,75,18,"Range:");
o->box(FL_UP_FRAME); o->box(FL_UP_FRAME);
o->down_box(FL_DOWN_FRAME); o->down_box(FL_DOWN_FRAME);
@ -52,9 +52,10 @@ Panner::Panner ( int X, int Y, int W, int H, const char *L ) :
o->labelsize(9); o->labelsize(9);
o->align(FL_ALIGN_LEFT); o->align(FL_ALIGN_LEFT);
o->add("1 Meter",0,0,&ranges[0]); o->add("1 Meter",0,0,&ranges[0]);
o->add("5 Meters",0,0,&ranges[1]); o->add("3 Meters",0,0,&ranges[1]);
o->add("10 Meters",0,0,&ranges[2]); o->add("5 Meters",0,0,&ranges[2]);
o->add("15 Meters",0,0,&ranges[3]); o->add("10 Meters",0,0,&ranges[3]);
o->add("15 Meters",0,0,&ranges[4]);
o->value(_range_mode); o->value(_range_mode);
o->callback( cb_mode, this ); o->callback( cb_mode, this );
} }

View File

@ -188,7 +188,7 @@ public:
Panner ( int X, int Y, int W, int H, const char *L = 0 ); Panner ( int X, int Y, int W, int H, const char *L = 0 );
float range ( void ) const { return *((int*)_range_choice->menu()[_range_mode].user_data()); } float range ( void ) const { return *((float*)_range_choice->menu()[_range_mode].user_data()); }
void range ( float v ); void range ( float v );
void clear_points ( void ) { _points.clear(); } void clear_points ( void ) { _points.clear(); }