ardour/livetrax
13
0
Fork 0
Code

WebSockets: rename *_desc nodes to *_description

Browse Source
This commit is contained in:
Luciano Iam 2020-04-18 12:44:00 +02:00 committed by Robin Gareus
parent 0e664b1556
commit 5105219076
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
4 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libs/surfaces/websockets/dispatcher.cc
View File

@ -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);

24
libs/surfaces/websockets/state.h
View File

@ -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;

6
share/web_surfaces/builtin/mixer-demo/js/main.js
View File

@ -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();

6
share/web_surfaces/shared/callback.js
View File

@ -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) {}
}