summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLuciano Iam <lucianito@gmail.com>2020-04-13 11:05:33 +0200
committerRobin Gareus <robin@gareus.org>2020-04-13 16:29:42 +0200
commit83353b3125f637684557d2e5c6040974b65da7c0 (patch)
tree09cf72a0c0b9403a24dba4005b24a846f0cb137c
parent9fa7eb15ac9d220c6483f98b562b0246fa99aad2 (diff)
WebSockets: add client getSurfaceManifest() example in mixer-demo
-rw-r--r--share/web_surfaces/builtin/mixer-demo/css/main.css6
-rw-r--r--share/web_surfaces/builtin/mixer-demo/index.html1
-rw-r--r--share/web_surfaces/builtin/mixer-demo/js/main.js5
-rw-r--r--share/web_surfaces/builtin/mixer-demo/manifest.xml2
-rw-r--r--share/web_surfaces/builtin/transport/manifest.xml2
5 files changed, 14 insertions, 2 deletions
diff --git a/share/web_surfaces/builtin/mixer-demo/css/main.css b/share/web_surfaces/builtin/mixer-demo/css/main.css
index 83e2ca9f85..5477f9840e 100644
--- a/share/web_surfaces/builtin/mixer-demo/css/main.css
+++ b/share/web_surfaces/builtin/mixer-demo/css/main.css
@@ -27,6 +27,12 @@ div {
box-shadow: 0px 0px 10px #000;
}
+#manifest {
+ padding: 0.25em 0.5em;
+ opacity: 0.5;
+ background: rgba(0,0,0,0.4);
+}
+
#log {
height: 6em;
overflow: scroll;
diff --git a/share/web_surfaces/builtin/mixer-demo/index.html b/share/web_surfaces/builtin/mixer-demo/index.html
index 247eba97e5..a94dd17f61 100644
--- a/share/web_surfaces/builtin/mixer-demo/index.html
+++ b/share/web_surfaces/builtin/mixer-demo/index.html
@@ -8,6 +8,7 @@
</head>
<body>
<div id="main">
+ <div id="manifest"></div>
<div id="strips"></div>
<div id="log"></div>
</div>
diff --git a/share/web_surfaces/builtin/mixer-demo/js/main.js b/share/web_surfaces/builtin/mixer-demo/js/main.js
index 1a5f3ae1d8..a2780565b6 100644
--- a/share/web_surfaces/builtin/mixer-demo/js/main.js
+++ b/share/web_surfaces/builtin/mixer-demo/js/main.js
@@ -38,6 +38,11 @@ import { Switch, DiscreteSlider, ContinuousSlider, LogarithmicSlider,
main();
function main () {
+ ardour.getSurfaceManifest().then((manifest) => {
+ const div = document.getElementById('manifest');
+ div.innerHTML = `${manifest.name} v${manifest.version}`;
+ });
+
ardour.addCallback({
onMessage: (msg) => {
log(`↙ ${msg}`, 'message-in');
diff --git a/share/web_surfaces/builtin/mixer-demo/manifest.xml b/share/web_surfaces/builtin/mixer-demo/manifest.xml
index 8174629f73..f0c1b5ddc3 100644
--- a/share/web_surfaces/builtin/mixer-demo/manifest.xml
+++ b/share/web_surfaces/builtin/mixer-demo/manifest.xml
@@ -2,5 +2,5 @@
<WebSurface>
<Name value="Mixer Demo"/>
<Description value="Mixer control capabilities demo aimed at developers"/>
- <Version value="1.0.0"/>
+ <Version value="0.0.1"/>
</WebSurface>
diff --git a/share/web_surfaces/builtin/transport/manifest.xml b/share/web_surfaces/builtin/transport/manifest.xml
index b08e5f8374..2f9174a152 100644
--- a/share/web_surfaces/builtin/transport/manifest.xml
+++ b/share/web_surfaces/builtin/transport/manifest.xml
@@ -2,5 +2,5 @@
<WebSurface>
<Name value="Transport"/>
<Description value="Provides basic transport control (under construction)"/>
- <Version value="1.0.0"/>
+ <Version value="0.0.1"/>
</WebSurface>