ardour/ardour
ardour/ardour
13
1
Fork 0
Code Pull Requests Releases Activity

WebSockets: rename Channel to ArdourMessageChannel

Browse Source
This commit is contained in:
Luciano Iam 2020-04-11 17:49:34 +02:00 committed by Robin Gareus
parent 02cdd5b52d
commit 5c78c85ef5
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
3 changed files with 30 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -16,7 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
import { Channel } from '/shared/channel.js';
import { ArdourMessageChannel } from '/shared/channel.js';
import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
StripPanSlider, StripGainSlider, StripMeter } from './widget.js';
@ -26,34 +27,38 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
const FEEDBACK_NODES = ['strip_gain', 'strip_pan', 'strip_meter', 'strip_plugin_enable',
'strip_plugin_param_value'];
const channel = new Channel(location.host);
const channel = new ArdourMessageChannel(location.host);
const widgets = {};
channel.messageCallback = (node, addr, val) => {
log(`↙ ${node} (${addr}) = ${val}`, 'message-in');
main();
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];
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.closeCallback = () => {
log('Connection dropped', 'error');
};
channel.closeCallback = () => {
log('Connection dropped', 'error');
};
channel.errorCallback = () => {
log('Connection error', 'error');
};
channel.errorCallback = () => {
log('Connection error', 'error');
};
channel.open();
channel.open();
}
function createStrip (addr, name) {
const id = `strip-${addr[0]}`;

4
share/web_surfaces/shared/ardour.js
View File

@ -16,12 +16,12 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
import { Channel } from './channel.js';
import { ArdourMessageChannel } from './channel.js';
export class Ardour {
constructor () {
this.channel = new Channel(location.host);
this.channel = new ArdourMessageChannel(location.host);
}
async open () {

2
share/web_surfaces/shared/channel.js
View File

@ -18,7 +18,7 @@
const JSON_INF = 1.0e+128;
export class Channel {
export class ArdourMessageChannel {
constructor (host) {
// https://developer.mozilla.org/en-US/docs/Web/API/URL/host