diff options
| author | Len Ovens <len@ovenwerks.net> | 2016-03-29 07:58:20 -0700 |
|---|---|---|
| committer | Len Ovens <len@ovenwerks.net> | 2016-03-29 07:58:20 -0700 |
| commit | 234b06a18cf3e8c07bc44fb4f8c1218e17fb65f1 (patch) | |
| tree | 043c5a92b9a17f2d4f25fd32bf7384caf47eb400 /libs/surfaces | |
| parent | a5b06c5a41c24b8a2c3939f7245ab7a21f8c8daa (diff) | |
OSC: Changed gainVCA to gainfader as VCA is already used.
Diffstat (limited to 'libs/surfaces')
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.h | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index 84f38f206b..7b2a4fe18a 100644 --- 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 efad21ba7c..c90620ef95 100644 --- 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); |