From 17edfc4c20cfd855d68e5b0ef044da2e7509f3f3 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Mon, 30 Apr 2018 23:30:10 +0200
Subject: On going effort, now load and support LUA+C plugin

---
 conf.d/project/etc/4a-softmixer-config.json | 23 +++++++++++++++++++----
 conf.d/project/etc/CMakeLists.txt           |  2 +-
 2 files changed, 20 insertions(+), 5 deletions(-)

(limited to 'conf.d/project/etc')

diff --git a/conf.d/project/etc/4a-softmixer-config.json b/conf.d/project/etc/4a-softmixer-config.json
index 9d89f07..db13705 100644
--- a/conf.d/project/etc/4a-softmixer-config.json
+++ b/conf.d/project/etc/4a-softmixer-config.json
@@ -3,18 +3,27 @@
     "metadata": {
         "uid": "Soft Mixer",
         "version": "1.0",
-        "api": "soft-mixer",
+        "api": "softmixer",
         "info": "Soft Mixer emulating hardware mixer",
-        "require": ["alsa-core"]
+        "require": ["alsacore"]
     },
     "plugins": [
         {
             "uid": "alsa-router",
             "ldpath": "package/lib/plugins",
+            "lua2c": ["AlsaDmix", "AlsaRouter"],
             "info": "Map alsa-loop subdevices to 4A HAL streams"
         }
     ],
 
+    "onload": [
+        {
+            "uid": "init-soft-mixer",
+            "info": "Initialise Audio Router",
+            "lua": "_init_softmixer_"
+        }
+    ],
+
     "sndcards": [
         {
             "uid": "Focusrite_Scarlett_18i8",
@@ -72,11 +81,17 @@
     "controls": [
         {
             "uid": "stream",
-            "function": "plugin://alsa-router/stream_ctl"
+            "callback": {
+                "plugin": "alsa-router",
+                "function": "stream_ctl"
+            }
         },
         {
             "uid": "zone",
-            "function": "plugin://alsa-router/zone_ctl"
+            "callback": {
+                "plugin": "alsa-router",
+                "function": "zone_ctl"
+            }
         }
     ]
 }
diff --git a/conf.d/project/etc/CMakeLists.txt b/conf.d/project/etc/CMakeLists.txt
index 378effc..2e7daa7 100644
--- a/conf.d/project/etc/CMakeLists.txt
+++ b/conf.d/project/etc/CMakeLists.txt
@@ -19,7 +19,7 @@
 ##################################################
 # Control Policy Config file
 ##################################################
-PROJECT_TARGET_ADD(soft-mixer-config)
+PROJECT_TARGET_ADD(softmixer-config)
 
 	file(GLOB CONF_FILES "*.json")
 
-- 
cgit 1.2.3-korg