From 2af80583a462fa0f71d0250bca03db5a4cf22fe8 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Fri, 18 May 2018 17:32:40 +0200
Subject: Update to last controller fix

---
 conf.d/project/etc/4a--softmixer-test.json | 35 ++++++++++++++++++++++++++++++
 conf.d/project/etc/4a-softmixer-test.json  | 35 ------------------------------
 conf.d/project/htdocs/index.html           |  2 +-
 3 files changed, 36 insertions(+), 36 deletions(-)
 create mode 100644 conf.d/project/etc/4a--softmixer-test.json
 delete mode 100644 conf.d/project/etc/4a-softmixer-test.json

(limited to 'conf.d')

diff --git a/conf.d/project/etc/4a--softmixer-test.json b/conf.d/project/etc/4a--softmixer-test.json
new file mode 100644
index 0000000..d646e3b
--- /dev/null
+++ b/conf.d/project/etc/4a--softmixer-test.json
@@ -0,0 +1,35 @@
+{
+    "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
+    "metadata": {
+        "uid": "Soft Mixer",
+        "version": "1.0",
+        "api": "softmixer",
+        "info": "Soft Mixer emulating hardware mixer"
+    },
+    "resources": [
+        {
+            "uid": "softmixer",
+            "info": "Map alsa-loop subdevices to 4A HAL streams",
+            "spath": "./plugins/alsa:../conf.d/project/lua.d",
+            "libs": ["alsa-softmixer.ctlso", "softmixer-simple-test.lua"],
+            "lua": {
+                "prefix": "smix",
+                "functions": ["_mixer_new_"]
+            }
+        }
+    ],
+
+    "onload": [
+        {
+            "uid": "init-soft-mixer",
+            "info": "Initialise Audio Router",
+            "action": "lua://softmixer#_mixer_simple_test_"
+        }
+    ],
+    "controls": [
+        {
+            "uid": "create",
+            "action": "plugin://softmixer#mixer_new"
+        }
+    ]
+}
diff --git a/conf.d/project/etc/4a-softmixer-test.json b/conf.d/project/etc/4a-softmixer-test.json
deleted file mode 100644
index d646e3b..0000000
--- a/conf.d/project/etc/4a-softmixer-test.json
+++ /dev/null
@@ -1,35 +0,0 @@
-{
-    "$schema": "http://iot.bzh/download/public/schema/json/ctl-schema.json",
-    "metadata": {
-        "uid": "Soft Mixer",
-        "version": "1.0",
-        "api": "softmixer",
-        "info": "Soft Mixer emulating hardware mixer"
-    },
-    "resources": [
-        {
-            "uid": "softmixer",
-            "info": "Map alsa-loop subdevices to 4A HAL streams",
-            "spath": "./plugins/alsa:../conf.d/project/lua.d",
-            "libs": ["alsa-softmixer.ctlso", "softmixer-simple-test.lua"],
-            "lua": {
-                "prefix": "smix",
-                "functions": ["_mixer_new_"]
-            }
-        }
-    ],
-
-    "onload": [
-        {
-            "uid": "init-soft-mixer",
-            "info": "Initialise Audio Router",
-            "action": "lua://softmixer#_mixer_simple_test_"
-        }
-    ],
-    "controls": [
-        {
-            "uid": "create",
-            "action": "plugin://softmixer#mixer_new"
-        }
-    ]
-}
diff --git a/conf.d/project/htdocs/index.html b/conf.d/project/htdocs/index.html
index 3b2b4ad..5709eb2 100644
--- a/conf.d/project/htdocs/index.html
+++ b/conf.d/project/htdocs/index.html
@@ -144,7 +144,7 @@
         <li><button onclick="callbinder('softmixer', 'simple_mixer/multimedia', {ramp: 80});">Stream Multimedia ramp=80"</button></li>
         <br>
         <li><button onclick="callbinder('softmixer', 'simple_mixer', {delete: true});">Close Mixer"</button></li>
-        <li><button onclick="callbinder('softmixer', 'create',my_test_mixer = {uid:'simple_mixer', backend: usb_yamaha, frontend: frontend,
+        <li><button onclick="callbinder('softmixer', 'create',{uid:'simple_mixer', backend: usb_yamaha, frontend: frontend,
                zones: [zone_front],streams: [stream_music, stream_navigation, stream_emergency]});">New Mixer"</button></li>
     </ol>
 
-- 
cgit 1.2.3-korg