use new record safe control in surface support

[ardour.git] / libs / surfaces / osc / osc.h

diff --git a/libs/surfaces/osc/osc.h b/libs/surfaces/osc/osc.h
index efad21ba7cd13c763bf1fb533f373653a78fc915..becff28b6d79b2ddcc47aa7bfeae934cd4463522 100644 (file)
--- a/libs/surfaces/osc/osc.h
+++ b/libs/surfaces/osc/osc.h
@@ -80,7 +80,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
        int set_feedback (bool yn);
        bool get_feedback () const;
 
-       void set_namespace_root (std::string);
 
        int start ();
        int stop ();
@@ -114,7 +113,6 @@ class OSC : public ARDOUR::ControlProtocol, public AbstractUI<OSCUIRequest>
        lo_server _osc_unix_server;
        std::string _osc_unix_socket_path;
        std::string _osc_url_file;
-       std::string _namespace_root;
        bool _send_route_changes;
        OSCDebugMode _debugmode;
 
@@ -290,7 +288,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 +303,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);