Update to last controller fix

4 files changed, 3 insertions, 3 deletions

diff --git a/app-controller-submodule b/app-controller-submodule
-Subproject 7af94b8a6f953ed247815bf15049fe951817a21
+Subproject a0704895ec6a6ed6ad6620fbef290eeeb0c103b
diff --git a/conf.d/project/etc/4a-softmixer-test.json b/conf.d/project/etc/4a--softmixer-test.json
index d646e3b..d646e3b 100644
--- a/conf.d/project/etc/4a-softmixer-test.json
+++ b/conf.d/project/etc/4a--softmixer-test.json
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>
 
diff --git a/plugins/alsa/alsa-softmixer.c b/plugins/alsa/alsa-softmixer.c
index b414e20..11d611d 100644
--- a/plugins/alsa/alsa-softmixer.c
+++ b/plugins/alsa/alsa-softmixer.c
@@ -22,11 +22,11 @@
 
 // Force Lua2cWrapper inclusion within already existing plugin
 
-CTLP_LUA_Registry("alsa-softmixer")
+CTLP_LUA_REGISTER("alsa-softmixer")
 
 // Call at initialisation time
 CTLP_ONLOAD(plugin, callbacks) {
     AFB_ApiDebug(plugin->api, "SoftMixer Plugin Registryed: uid='%s' 'info='%s'", plugin->uid, plugin->info);    
-    return NULL;
+    return 0;
 }