smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-23 15:16:25 +01:00
Code Issues Projects Releases Wiki Activity

WebSockets: let clients know if a strip is a VCA

Browse source 
This allows to hide the panner for example
This commit is contained in:
Luciano Iam 2020-04-21 16:20:16 +02:00
parent 68463cb591
commit 80dc3a38e0
3 changed files with 21 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

13
libs/surfaces/websockets/dispatcher.cc
View file

@ -63,12 +63,21 @@ WebsocketsDispatcher::update_all_nodes (Client client)
for (uint32_t strip_n = 0; strip_n < strips ().strip_count (); ++strip_n) { for (uint32_t strip_n = 0; strip_n < strips ().strip_count (); ++strip_n) {
boost::shared_ptr<Stripable> strip = strips ().nth_strip (strip_n); boost::shared_ptr<Stripable> strip = strips ().nth_strip (strip_n);
update (client, Node::strip_description, strip_n, strip->name ()); bool is_vca = strip->presentation_info ().flags () & ARDOUR::PresentationInfo::VCA;
AddressVector strip_addr = AddressVector ();
strip_addr.push_back (strip_n);
ValueVector strip_desc = ValueVector ();
strip_desc.push_back (strip->name ());
strip_desc.push_back (is_vca);
update (client, Node::strip_description, strip_addr, strip_desc);
update (client, Node::strip_gain, strip_n, strips ().strip_gain (strip_n)); update (client, Node::strip_gain, strip_n, strips ().strip_gain (strip_n));
update (client, Node::strip_mute, strip_n, strips ().strip_mute (strip_n)); update (client, Node::strip_mute, strip_n, strips ().strip_mute (strip_n));
// Pan and plugins not available in VCAs // Pan and plugins not available in VCAs
if ((strip->presentation_info ().flags () & ARDOUR::PresentationInfo::VCA)) { if (is_vca) {
continue; continue;
} }

16
share/web_surfaces/builtin/mixer-demo/js/main.js
View file

@ -52,7 +52,7 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
ardour.connect(); ardour.connect();
} }
function createStrip (stripId, name) { function createStrip (stripId, name, isVca) {
const domId = `strip-${stripId}`; const domId = `strip-${stripId}`;
if (document.getElementById(domId) != null) { if (document.getElementById(domId) != null) {
return; return;
@ -75,12 +75,14 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
gain.appendTo(holder); gain.appendTo(holder);
connectWidget(gain, ANode.STRIP_GAIN, stripId); connectWidget(gain, ANode.STRIP_GAIN, stripId);
// pan if (!isVca) {
holder = createElem(`<div class="strip-slider"></div>`, div); // pan
createElem(`<label>Pan</label>`, holder); holder = createElem(`<div class="strip-slider"></div>`, div);
const pan = new StripPanSlider(); createElem(`<label>Pan</label>`, holder);
pan.appendTo(holder); const pan = new StripPanSlider();
connectWidget(pan, ANode.STRIP_PAN, stripId); pan.appendTo(holder);
connectWidget(pan, ANode.STRIP_PAN, stripId);
}
} }
function createStripPlugin (stripId, pluginId, name) { function createStripPlugin (stripId, pluginId, name) {

2
share/web_surfaces/shared/callback.js
View file

@ -35,7 +35,7 @@
onRecordState (value) {} onRecordState (value) {}
// Strips // Strips
onStripDescription (stripId, name) {} onStripDescription (stripId, name, isVca) {}
onStripMeter (stripId, db) {} onStripMeter (stripId, db) {}
onStripGain (stripId, db) {} onStripGain (stripId, db) {}
onStripPan (stripId, value) {} onStripPan (stripId, value) {}