OSC: LFE is a control not a position.

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index d6c4fa1758aa92855a3a5e35eb52b5335c5d2370..ad90dc9207c0db774541fe0bec49ff21bb8d5dec 100644 (file)
--- 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 b01c4876b33290dadf9e62813952e92c3fddc7ca..07de65f1535e0d0644d822f3a938bc9b76fd09b8 100644 (file)
--- 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);