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

WebSockets: split channel.js into channel.js and message.js

Browse Source
This commit is contained in:
Luciano Iam 2020-04-12 15:49:54 +02:00 committed by Robin Gareus
parent 1e3084d760
commit 1f0dfddde1
Signed by: rgareus
GPG Key ID: A090BCE02CF57F04
5 changed files with 96 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -19,7 +19,8 @@
// This example does not call the high level API methods in ardour.js
// but interacts directly with the low level message stream instead
import { MessageChannel, Message } from '/shared/channel.js';
import { Message } from '/shared/message.js';
import { MessageChannel } from '/shared/channel.js';
import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
StripPanSlider, StripGainSlider, StripMeter } from './widget.js';

4
share/web_surfaces/builtin/mixer-demo/js/widget.js
View File

@ -16,7 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
import { nodeAddressHash } from '/shared/channel.js';
import { Message } from '/shared/message.js';
export class Widget {
@ -41,7 +41,7 @@ export class Widget {
}
get hash () {
return nodeAddressHash(this.node, this.addr);
return Message.hash(this.node, this.addr);
}
}

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

@ -16,7 +16,8 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
import { MessageChannel, Message, ANode } from './channel.js';
import { ANode, Message } from './message.js';
import { MessageChannel } from './channel.js';
export class Ardour {
@ -39,6 +40,10 @@ export class Ardour {
this._channel.closeCallback = () => {};
this._channel.close();
}
send (msg) {
this._channel.send(msg);
}
errorCallback (error) {
// empty

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

@ -16,26 +16,7 @@
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
export const JSON_INF = 1.0e+128;
export const ANode = Object.freeze({
TEMPO: 'tempo',
STRIP_DESC: 'strip_desc',
STRIP_METER: 'strip_meter',
STRIP_GAIN: 'strip_gain',
STRIP_PAN: 'strip_pan',
STRIP_MUTE: 'strip_mute',
STRIP_PLUGIN_DESC: 'strip_plugin_desc',
STRIP_PLUGIN_ENABLE: 'strip_plugin_enable',
STRUP_PLUGIN_PARAM_DESC: 'strip_plugin_param_desc',
STRIP_PLUGIN_PARAM_VALUE: 'strip_plugin_param_value'
});
export function nodeAddressHash(node, addr) {
return [node].concat(addr || []).join('_');
}
import { ANode, Message } from './message.js';
export class MessageChannel {
@ -85,53 +66,3 @@ export class MessageChannel {
}
}
export class Message {
constructor (node, addr, val) {
this.node = node;
this.addr = addr;
this.val = [];
for (const i in val) {
if (val[i] >= JSON_INF) {
this.val.push(Infinity);
} else if (val[i] <= -JSON_INF) {
this.val.push(-Infinity);
} else {
this.val.push(val[i]);
}
}
}
static fromJsonText (jsonText) {
let rawMsg = JSON.parse(jsonText);
return new Message(rawMsg.node, rawMsg.addr || [], rawMsg.val);
}
toJsonText () {
let val = [];
for (const i in this.val) {
if (this.val[i] == Infinity) {
val.push(JSON_INF);
} else if (this.val[i] == -Infinity) {
val.push(-JSON_INF);
} else {
val.push(this.val[i]);
}
}
return JSON.stringify({node: this.node, addr: this.addr, val: val});
}
get hash () {
return nodeAddressHash(this.node, this.addr);
}
toString () {
return `${this.node} (${this.addr}) = ${this.val}`;
}
}

85
share/web_surfaces/shared/message.js Normal file
View File

@ -0,0 +1,85 @@
/*
* Copyright © 2020 Luciano Iam <lucianito@gmail.com>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation; either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License along
* with this program; if not, write to the Free Software Foundation, Inc.,
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
export const JSON_INF = 1.0e+128;
export const ANode = Object.freeze({
TEMPO: 'tempo',
STRIP_DESC: 'strip_desc',
STRIP_METER: 'strip_meter',
STRIP_GAIN: 'strip_gain',
STRIP_PAN: 'strip_pan',
STRIP_MUTE: 'strip_mute',
STRIP_PLUGIN_DESC: 'strip_plugin_desc',
STRIP_PLUGIN_ENABLE: 'strip_plugin_enable',
STRUP_PLUGIN_PARAM_DESC: 'strip_plugin_param_desc',
STRIP_PLUGIN_PARAM_VALUE: 'strip_plugin_param_value'
});
export class Message {
constructor (node, addr, val) {
this.node = node;
this.addr = addr;
this.val = [];
for (const i in val) {
if (val[i] >= JSON_INF) {
this.val.push(Infinity);
} else if (val[i] <= -JSON_INF) {
this.val.push(-Infinity);
} else {
this.val.push(val[i]);
}
}
}
static hash (node, addr) {
return [node].concat(addr || []).join('_');
}
static fromJsonText (jsonText) {
let rawMsg = JSON.parse(jsonText);
return new Message(rawMsg.node, rawMsg.addr || [], rawMsg.val);
}
toJsonText () {
let val = [];
for (const i in this.val) {
if (this.val[i] == Infinity) {
val.push(JSON_INF);
} else if (this.val[i] == -Infinity) {
val.push(-JSON_INF);
} else {
val.push(this.val[i]);
}
}
return JSON.stringify({node: this.node, addr: this.addr, val: val});
}
get hash () {
return Message.hash(this.node, this.addr);
}
toString () {
return `${this.node} (${this.addr}) = ${this.val}`;
}
}