ardour/livetrax
13
0
Fork 0
Code

OSC: LFE is a control not a position.

Browse Source
This commit is contained in:
Len Ovens 2016-07-15 11:44:49 -07:00
parent 4203e7c903
commit dade1f39b7
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
libs/surfaces/osc/osc.cc
View File

@ -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

6
libs/surfaces/osc/osc_select_observer.cc
View File

@ -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);