diff options
| -rw-r--r-- | libs/surfaces/websockets/dispatcher.cc | 6 | ||||
| -rw-r--r-- | libs/surfaces/websockets/state.h | 24 | ||||
| -rw-r--r-- | share/web_surfaces/builtin/mixer-demo/js/main.js | 6 | ||||
| -rw-r--r-- | share/web_surfaces/shared/callback.js | 6 |
4 files changed, 21 insertions, 21 deletions
diff --git a/libs/surfaces/websockets/dispatcher.cc b/libs/surfaces/websockets/dispatcher.cc index a70677cba5..688044a8f7 100644 --- a/libs/surfaces/websockets/dispatcher.cc +++ b/libs/surfaces/websockets/dispatcher.cc @@ -63,7 +63,7 @@ WebsocketsDispatcher::update_all_nodes (Client client) continue; } - update (client, Node::strip_desc, strip_n, strip->name ()); + update (client, Node::strip_description, strip_n, strip->name ()); update (client, Node::strip_gain, strip_n, strips ().strip_gain (strip_n)); update (client, Node::strip_pan, strip_n, strips ().strip_pan (strip_n)); update (client, Node::strip_mute, strip_n, strips ().strip_mute (strip_n)); @@ -76,7 +76,7 @@ WebsocketsDispatcher::update_all_nodes (Client client) } boost::shared_ptr<Plugin> plugin = insert->plugin (); - update (client, Node::strip_plugin_desc, strip_n, plugin_n, + update (client, Node::strip_plugin_description, strip_n, plugin_n, static_cast<std::string> (plugin->name ())); update (client, Node::strip_plugin_enable, strip_n, plugin_n, @@ -113,7 +113,7 @@ WebsocketsDispatcher::update_all_nodes (Client client) val.push_back (pd.logarithmic); } - update (client, Node::strip_plugin_param_desc, addr, val); + update (client, Node::strip_plugin_param_description, addr, val); TypedValue value = strips ().strip_plugin_param_value (strip_n, plugin_n, param_n); update (client, Node::strip_plugin_param_value, strip_n, plugin_n, param_n, value); diff --git a/libs/surfaces/websockets/state.h b/libs/surfaces/websockets/state.h index 7bc7555f3d..046cfebb3e 100644 --- a/libs/surfaces/websockets/state.h +++ b/libs/surfaces/websockets/state.h @@ -31,18 +31,18 @@ namespace Node { - const std::string tempo = "tempo"; - const std::string transport_roll = "transport_roll"; - const std::string record_state = "record_state"; - const std::string strip_desc = "strip_desc"; - const std::string strip_meter = "strip_meter"; - const std::string strip_gain = "strip_gain"; - const std::string strip_pan = "strip_pan"; - const std::string strip_mute = "strip_mute"; - const std::string strip_plugin_desc = "strip_plugin_desc"; - const std::string strip_plugin_enable = "strip_plugin_enable"; - const std::string strip_plugin_param_desc = "strip_plugin_param_desc"; - const std::string strip_plugin_param_value = "strip_plugin_param_value"; + const std::string tempo = "tempo"; + const std::string transport_roll = "transport_roll"; + const std::string record_state = "record_state"; + const std::string strip_description = "strip_description"; + const std::string strip_meter = "strip_meter"; + const std::string strip_gain = "strip_gain"; + const std::string strip_pan = "strip_pan"; + const std::string strip_mute = "strip_mute"; + const std::string strip_plugin_description = "strip_plugin_description"; + const std::string strip_plugin_enable = "strip_plugin_enable"; + const std::string strip_plugin_param_description = "strip_plugin_param_description"; + const std::string strip_plugin_param_value = "strip_plugin_param_value"; } // namespace Node typedef std::vector<uint32_t> AddressVector; diff --git a/share/web_surfaces/builtin/mixer-demo/js/main.js b/share/web_surfaces/builtin/mixer-demo/js/main.js index b6713664b5..209ddf1bab 100644 --- a/share/web_surfaces/builtin/mixer-demo/js/main.js +++ b/share/web_surfaces/builtin/mixer-demo/js/main.js @@ -44,9 +44,9 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider, onConnected: (error) => { log('Client connected', 'info'); }, onDisconnected: (error) => { log('Client disconnected', 'error'); }, onMessage: processMessage, - onStripDesc: createStrip, - onStripPluginDesc: createStripPlugin, - onStripPluginParamDesc: createStripPluginParam + onStripDescription: createStrip, + onStripPluginDescription: createStripPlugin, + onStripPluginParamDescription: createStripPluginParam }); ardour.connect(); diff --git a/share/web_surfaces/shared/callback.js b/share/web_surfaces/shared/callback.js index 9da8b420d2..ca1f33e437 100644 --- a/share/web_surfaces/shared/callback.js +++ b/share/web_surfaces/shared/callback.js @@ -32,14 +32,14 @@ onTempo (bpm) {} // Strips - onStripDesc (stripId, name) {} + onStripDescription (stripId, name) {} onStripMeter (stripId, db) {} onStripGain (stripId, db) {} onStripPan (stripId, value) {} onStripMute (stripId, value) {} // Strip plugins - onStripPluginDesc (stripId, pluginId, name) {} + onStripPluginDescription (stripId, pluginId, name) {} onStripPluginEnable (stripId, pluginId, value) {} // Strip plugin parameters @@ -47,7 +47,7 @@ // 'b' : boolean // 'i' : integer // 'd' : double - onStripPluginParamDesc (stripId, pluginId, paramId, name, valueType, min, max, isLog) {} + onStripPluginParamDescription (stripId, pluginId, paramId, name, valueType, min, max, isLog) {} onStripPluginParamValue (stripId, pluginId, paramId, value) {} } |