OSC: Changed gainVCA to gainfader as VCA is already used.

diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc
index 84f38f206b80642ee7b2bbd2670aaaa9f49401d0..7b2a4fe18aa08801cd2528340473a23cb725788e 100644 (file)
--- a/libs/surfaces/osc/osc.cc
+++ b/libs/surfaces/osc/osc.cc
@@ -477,7 +477,7 @@ OSC::register_callbacks()
                REGISTER_CALLBACK (serv, "/ardour/routes/recenable", "ii", route_recenable);
                REGISTER_CALLBACK (serv, "/ardour/routes/gainabs", "if", route_set_gain_abs);
                REGISTER_CALLBACK (serv, "/ardour/routes/gaindB", "if", route_set_gain_dB);
-               REGISTER_CALLBACK (serv, "/ardour/routes/gainVCA", "if", route_set_gain_VCA);
+               REGISTER_CALLBACK (serv, "/ardour/routes/gainfader", "if", route_set_gain_fader);
                REGISTER_CALLBACK (serv, "/ardour/routes/trimabs", "if", route_set_trim_abs);
                REGISTER_CALLBACK (serv, "/ardour/routes/trimdB", "if", route_set_trim_dB);
                REGISTER_CALLBACK (serv, "/ardour/routes/pan_stereo_position", "if", route_set_pan_stereo_position);
@@ -1115,7 +1115,7 @@ OSC::route_set_gain_dB (int rid, float dB)
 }
 
 int
-OSC::route_set_gain_VCA (int rid, float pos)
+OSC::route_set_gain_fader (int rid, float pos)
 {
        return route_set_gain_abs (rid, slider_position_to_gain_with_max (pos, 2.0));
 }

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index efad21ba7cd13c763bf1fb533f373653a78fc915..c90620ef95f644385c4979a14c158965618ca6e4 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -290,7 +290,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
        PATH_CALLBACK2(route_recenable,i,i);
        PATH_CALLBACK2(route_set_gain_abs,i,f);
        PATH_CALLBACK2(route_set_gain_dB,i,f);
-       PATH_CALLBACK2(route_set_gain_VCA,i,f);
+       PATH_CALLBACK2(route_set_gain_fader,i,f);
        PATH_CALLBACK2(route_set_trim_abs,i,f);
        PATH_CALLBACK2(route_set_trim_dB,i,f);
        PATH_CALLBACK2(route_set_pan_stereo_position,i,f);
@@ -305,7 +305,7 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
        int route_recenable (int rid, int yn);
        int route_set_gain_abs (int rid, float level);
        int route_set_gain_dB (int rid, float dB);
-       int route_set_gain_VCA (int rid, float pos);
+       int route_set_gain_fader (int rid, float pos);
        int route_set_trim_abs (int rid, float level);
        int route_set_trim_dB (int rid, float dB);
        int route_set_pan_stereo_position (int rid, float left_right_fraction);