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

Make spatialization mode of controller_module more robust.

pull/3/head
Jonathan Moore Liles 2010-02-24 17:25:56 -06:00
parent 93a6d878f2
commit 6ac4106a6c
2 changed files with 20 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
mixer/src/Controller_Module.C
View File

@ -281,6 +281,7 @@ Controller_Module::connect_spatializer_to ( Module *m )
init_sizes(); init_sizes();
} }
_type = SPATIALIZATION;
return true; return true;
} }
} }
@ -300,6 +301,7 @@ Controller_Module::connect_to ( Port *p )
w = o; w = o;
o->value( p->control_value() ); o->value( p->control_value() );
_type = TOGGLE;
} }
else if ( p->hints.type == Module::Port::Hints::INTEGER ) else if ( p->hints.type == Module::Port::Hints::INTEGER )
{ {
@ -317,6 +319,8 @@ Controller_Module::connect_to ( Port *p )
o->maximum( p->hints.maximum ); o->maximum( p->hints.maximum );
} }
_type = SPINNER;
o->value( p->control_value() ); o->value( p->control_value() );
} }
else if ( p->hints.type == Module::Port::Hints::LOGARITHMIC ) else if ( p->hints.type == Module::Port::Hints::LOGARITHMIC )
@ -340,6 +344,8 @@ Controller_Module::connect_to ( Port *p )
} }
o->value( p->control_value() ); o->value( p->control_value() );
_type = SLIDER;
} }
else else
{ {
@ -358,6 +364,7 @@ Controller_Module::connect_to ( Port *p )
o->value( p->control_value() ); o->value( p->control_value() );
} }
_type = KNOB;
} }
control_value = p->control_value(); control_value = p->control_value();
@ -490,7 +497,8 @@ Controller_Module::handle ( int m )
if ( test_press( FL_BUTTON3 ) ) if ( test_press( FL_BUTTON3 ) )
{ {
/* context menu */ /* context menu */
menu_popup( &menu() ); if ( type() != SPATIALIZATION )
menu_popup( &menu() );
return 1; return 1;
} }
@ -509,9 +517,8 @@ Controller_Module::handle_control_changed ( Port * )
if ( contains( Fl::pushed() ) ) if ( contains( Fl::pushed() ) )
return; return;
if ( control_output.size() > 1 ) if ( type() == SPATIALIZATION )
{ {
/* spatializer */
Panner *pan = (Panner*)control; Panner *pan = (Panner*)control;
pan->point( 0 )->azimuth( control_output[0].control_value() ); pan->point( 0 )->azimuth( control_output[0].control_value() );
@ -534,9 +541,8 @@ Controller_Module::process ( nframes_t nframes )
{ {
THREAD_ASSERT( RT ); THREAD_ASSERT( RT );
if ( control_output.size() > 1 ) if ( type() == SPATIALIZATION )
{ {
/* this is a spatializer controller... */
return; return;
} }

9
mixer/src/Controller_Module.H
View File

@ -46,9 +46,17 @@ public:
enum Mode { GUI, CV, OSC, MIDI }; enum Mode { GUI, CV, OSC, MIDI };
enum Type { KNOB,
SLIDER,
SPINNER,
TOGGLE,
SPATIALIZATION };
Mode mode ( void ) const { return _mode; } Mode mode ( void ) const { return _mode; }
void mode ( Mode v ); void mode ( Mode v );
Type type ( void ) const { return _type; }
Controller_Module ( bool is_default = false ); Controller_Module ( bool is_default = false );
virtual ~Controller_Module ( ); virtual ~Controller_Module ( );
@ -90,6 +98,7 @@ private:
std::vector<JACK::Port> jack_input; std::vector<JACK::Port> jack_input;
Mode _mode; Mode _mode;
Type _type;
Fl_Valuator *control; Fl_Valuator *control;