diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-07-15 11:44:49 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-07-15 11:44:49 -0700 |
| commit | dade1f39b7809df0013561fd8f7a342928970d56 (patch) | |
| tree | 6e19b9a85479ee2603570ce54aff5706f3539675 /libs/surfaces/osc | |
| parent | 4203e7c9035e98987519fac3c6058d1a3279791b (diff) | |
OSC: LFE is a control not a position.
Diffstat (limited to 'libs/surfaces/osc')
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc_select_observer.cc | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index d6c4fa1758..ad90dc9207 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -552,7 +552,7 @@ OSC::register_callbacks() REGISTER_CALLBACK (serv, "/select/expand", "i", sel_expand); REGISTER_CALLBACK (serv, "/select/pan_elevation_position", "f", sel_pan_elevation); REGISTER_CALLBACK (serv, "/select/pan_frontback_position", "f", sel_pan_frontback); - REGISTER_CALLBACK (serv, "/select/pan_lfe_position", "f", sel_pan_lfe); + REGISTER_CALLBACK (serv, "/select/pan_lfe_control", "f", sel_pan_lfe); REGISTER_CALLBACK (serv, "/select/comp_enable", "f", sel_comp_enable); REGISTER_CALLBACK (serv, "/select/comp_threshold", "f", sel_comp_threshold); REGISTER_CALLBACK (serv, "/select/comp_speed", "f", sel_comp_speed); @@ -2697,7 +2697,7 @@ OSC::sel_pan_lfe (float val, lo_message msg) return 0; } } - return sel_fail ("pan_lfe_position", 0, lo_message_get_source (msg)); + return sel_fail ("pan_lfe_control", 0, lo_message_get_source (msg)); } // compressor control diff --git a/libs/surfaces/osc/osc_select_observer.cc b/libs/surfaces/osc/osc_select_observer.cc index b01c4876b3..07de65f153 100644 --- a/libs/surfaces/osc/osc_select_observer.cc +++ b/libs/surfaces/osc/osc_select_observer.cc @@ -140,8 +140,8 @@ OSCSelectObserver::OSCSelectObserver (boost::shared_ptr<Stripable> s, lo_address change_message ("/select/pan_frontback_position", _strip->pan_frontback_control()); } if (_strip->pan_lfe_control ()) { - _strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_position"), _strip->pan_lfe_control()), OSC::instance()); - change_message ("/select/pan_lfe_position", _strip->pan_lfe_control()); + _strip->pan_lfe_control()->Changed.connect (strip_connections, MISSING_INVALIDATOR, boost::bind (&OSCSelectObserver::change_message, this, X_("/select/pan_lfe_control"), _strip->pan_lfe_control()), OSC::instance()); + change_message ("/select/pan_lfe_control", _strip->pan_lfe_control()); } // Compressor if (_strip->comp_enable_controllable ()) { @@ -220,7 +220,7 @@ OSCSelectObserver::~OSCSelectObserver () if (feedback[13]) { // Well known controls clear_strip ("/select/pan_elevation_position", .5); clear_strip ("/select/pan_frontback_position", .5); - clear_strip ("/select/pan_lfe_position", 0); + clear_strip ("/select/pan_lfe_control", 0); clear_strip ("/select/comp_enable", 0); clear_strip ("/select/comp_threshold", 0); clear_strip ("/select/comp_speed", 0); |