diff options
author | Luciano Iam <lucianito@gmail.com> | 2020-04-12 12:01:41 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2020-04-13 16:29:39 +0200 |
commit | 22199e8845c08b707c2a547cf262b94342ffc646 (patch) | |
tree | 4e448e566bcd4e0402e24a9fff7bc552f5abfcb3 /share/web_surfaces/builtin | |
parent | a51ce18334227653b0cb22fa86f9735cfee02e10 (diff) |
WebSockets: decouple Message from MessageChannel
Diffstat (limited to 'share/web_surfaces/builtin')
-rw-r--r-- | share/web_surfaces/builtin/mixer-demo/js/main.js | 32 | ||||
-rw-r--r-- | share/web_surfaces/builtin/mixer-demo/js/widget.js | 2 |
2 files changed, 17 insertions, 17 deletions
diff --git a/share/web_surfaces/builtin/mixer-demo/js/main.js b/share/web_surfaces/builtin/mixer-demo/js/main.js index 081aa722f3..703448d7bc 100644 --- a/share/web_surfaces/builtin/mixer-demo/js/main.js +++ b/share/web_surfaces/builtin/mixer-demo/js/main.js @@ -16,7 +16,7 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. */ -import { MessageChannel } from '/shared/channel.js'; +import { MessageChannel, Message } from '/shared/channel.js'; import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider, StripPanSlider, StripGainSlider, StripMeter } from './widget.js'; @@ -33,18 +33,18 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider, main(); function main () { - channel.messageCallback = (node, addr, val) => { - log(`↙ ${node} (${addr}) = ${val}`, 'message-in'); - - if (node == 'strip_desc') { - createStrip (addr, ...val); - } else if (node == 'strip_plugin_desc') { - createStripPlugin (addr, ...val); - } else if (node == 'strip_plugin_param_desc') { - createStripPluginParam (addr, ...val); - } else if (FEEDBACK_NODES.includes(node)) { - if (widgets[[node, addr]]) { - widgets[[node, addr]].value = val[0]; + channel.messageCallback = (msg) => { + log(`↙ ${msg}`, 'message-in'); + + if (msg.node == 'strip_desc') { + createStrip (msg.addr, ...msg.val); + } else if (msg.node == 'strip_plugin_desc') { + createStripPlugin (msg.addr, ...msg.val); + } else if (msg.node == 'strip_plugin_param_desc') { + createStripPluginParam (msg.addr, ...msg.val); + } else if (FEEDBACK_NODES.includes(msg.node)) { + if (widgets[[msg.node, msg.addr]]) { + widgets[[msg.node, msg.addr]].value = msg.val[0]; } } }; @@ -127,9 +127,9 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider, } function send (widget) { - const val = widget.value; - log(`↗ ${widget.node} (${widget.addr}) = ${val}`, 'message-out'); - channel.send(widget.node, widget.addr, [val]); + const msg = new Message(widget.node, widget.addr, [widget.value]); + log(`↗ ${msg}`, 'message-out'); + channel.send(msg); } function createElem (html, parent) { diff --git a/share/web_surfaces/builtin/mixer-demo/js/widget.js b/share/web_surfaces/builtin/mixer-demo/js/widget.js index 1d5cab22b9..45231cff18 100644 --- a/share/web_surfaces/builtin/mixer-demo/js/widget.js +++ b/share/web_surfaces/builtin/mixer-demo/js/widget.js @@ -39,7 +39,7 @@ export class Widget { } get hash () { - return [this.node, this.addr]; + return [this.node].concat(this.addr).join('_'); } } |