Late Evening Commit

25 files changed, 961 insertions, 232 deletions

diff --git a/Alsa/CMakeLists.txt b/AlsaSound/CMakeLists.txt
index e8173f9..7b1d5e9 100644
--- a/Alsa/CMakeLists.txt
+++ b/AlsaSound/CMakeLists.txt
@@ -16,7 +16,7 @@
 # limitations under the License.
 ###########################################################################
 
-PROJECT(alsa-binding C)
+PROJECT(alsa-bindings C)
 PKG_CHECK_MODULES(alsa REQUIRED alsa)
 
 # Max Sound Card Number eligible to ctlevent subscription
@@ -27,5 +27,6 @@ SET(link_libraries
         ${link_libraries}
 	)
 
-ADD_SUBDIRECTORY(core-binding)
+ADD_SUBDIRECTORY(CoreBinding)
+ADD_SUBDIRECTORY(HardAbsLayer)
 
diff --git a/Alsa/core-binding/AlsaAfbBinding.c b/AlsaSound/CoreBinding/AlsaAfbBinding.c
index 95d5e8d..2c5c789 100644
--- a/Alsa/core-binding/AlsaAfbBinding.c
+++ b/AlsaSound/CoreBinding/AlsaAfbBinding.c
@@ -26,9 +26,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#define _GNU_SOURCE  // needed for vasprintf
 #include "AlsaLibMapping.h"
-#include <afb/afb-service-itf.h>
 
 PUBLIC const struct afb_binding_interface *afbIface;   
 
@@ -42,10 +40,11 @@ static void localping(struct afb_req request) {
  */
 static const struct afb_verb_desc_v1 binding_verbs[] = {
   /* VERB'S NAME            SESSION MANAGEMENT          FUNCTION TO CALL         SHORT DESCRIPTION */
-  { .name= "ping"   ,    .session= AFB_SESSION_NONE, .callback= localping,   .info= "Ping Binding" },
-  { .name= "getinfo",    .session= AFB_SESSION_NONE, .callback= alsaGetInfo, .info= "List All/One Sound Cards Info" },
-  { .name= "getctl",    .session= AFB_SESSION_NONE,  .callback= alsaGetCtl,  .info= "List All/One Controls from selected sndcard" },
-  { .name= "subctl",    .session= AFB_SESSION_NONE,  .callback= alsaSubCtl,  .info= "Subscribe to events from selected sndcard" },
+  { .name= "ping"   ,   .session= AFB_SESSION_NONE, .callback= localping,    .info= "Ping Binding" },
+  { .name= "getinfo",   .session= AFB_SESSION_NONE, .callback= alsaGetInfo,  .info= "List All/One Sound Cards Info" },
+  { .name= "getctl",    .session= AFB_SESSION_NONE, .callback= alsaGetCtl,   .info= "List All/One Controls from selected sndcard" },
+  { .name= "subscribe", .session= AFB_SESSION_NONE, .callback= alsaSubcribe, .info= "Subscribe to events from selected sndcard" },
+  { .name= "getcardid", .session= AFB_SESSION_NONE, .callback= alsaGetCardId,.info= "Get CardId from its short/long name" },
   { .name= NULL } /* marker for end of the array */
 };
 
@@ -64,6 +63,7 @@ static const struct afb_binding binding_description = {
 
 extern int afbBindingV1ServiceInit(struct afb_service service) {
    // this is call when after all bindings are loaded
+   alsaLibInit (service);  // AlsaBinding check for sound card at installation time   
    return (0); 
 };
 
diff --git a/Alsa/core-binding/AlsaLibMapping.c b/AlsaSound/CoreBinding/AlsaLibMapping.c
index 59ce8ff..8dc1772 100644
--- a/Alsa/core-binding/AlsaLibMapping.c
+++ b/AlsaSound/CoreBinding/AlsaLibMapping.c
@@ -29,6 +29,7 @@
 #include "AlsaLibMapping.h"
 
 #include <systemd/sd-event.h>
+static struct afb_service srvitf;
 
 // generic structure to pass parsed query values
 typedef struct {
@@ -51,9 +52,6 @@ typedef struct {
     evtHandleT *evtHandle;
 } sndHandleT;
 
-
-
-
 STATIC json_object *DB2StringJsonOject (long dB) {
     char label [20];
 	if (dB < 0) {
@@ -323,7 +321,7 @@ PUBLIC void alsaGetInfo (struct afb_req request) {
         sndcards =json_object_new_array();
 
         // loop on potential card number
-        for (card =0; card < 32; card++) {
+        for (card =0; card < MAX_SND_CARD; card++) {
 
             // build card devid and probe it
             snprintf (devid, sizeof(devid), "hw:%i", card);
@@ -626,8 +624,8 @@ STATIC  int sndCtlEventCB (sd_event_source* src, int fd, uint32_t revents, void*
 	return (0);    
 }
 
-// Loop on every potential Sound card and register active one
-PUBLIC void alsaSubCtl (struct afb_req request) {
+// Subscribe to every Alsa CtlEvent send by a given board
+PUBLIC void alsaSubcribe (struct afb_req request) {
     static sndHandleT sndHandles[MAX_SND_CARD];
     evtHandleT *evtHandle;
     snd_ctl_t  *ctlHandle;
@@ -675,6 +673,7 @@ PUBLIC void alsaSubCtl (struct afb_req request) {
         evtHandle->ctl = ctlHandle;
         sndHandles[idxFree].ucount = 0;
         sndHandles[idxFree].cardid = cardid;
+        sndHandles[idxFree].evtHandle = evtHandle;
         
         // subscribe for sndctl events attached to devid
         err = snd_ctl_subscribe_events(evtHandle->ctl, 1);
@@ -714,10 +713,6 @@ PUBLIC void alsaSubCtl (struct afb_req request) {
         goto ExitOnError;
     }
 
-    json_object *ctlEventJson = json_object_new_object();
-    json_object_object_add(ctlEventJson, "test",json_object_new_string ("done"));
-    afb_event_push(evtHandle->afbevt, ctlEventJson );
-    
     // increase usage count and return success
     sndHandles[idx].ucount ++;
     afb_req_success(request, NULL, NULL);
@@ -726,3 +721,67 @@ PUBLIC void alsaSubCtl (struct afb_req request) {
   ExitOnError:
         return;
 }
+
+// Subscribe to every Alsa CtlEvent send by a given board
+PUBLIC void alsaGetCardId (struct afb_req request) {
+    char devid [10];
+    int card, err, index;
+    json_object *respJson;
+    snd_ctl_t   *ctlHandle;
+    snd_ctl_card_info_t *cardinfo;
+    
+    const char *sndname = afb_req_value(request, "sndname");
+    if (sndname == NULL) {
+        afb_req_fail_f (request, "argument-missing", "sndname=SndCardName missing");
+        goto ExitOnError;
+    }
+    
+    // loop on potential card number
+    snd_ctl_card_info_alloca(&cardinfo);  
+    for (card =0; card < MAX_SND_CARD; card++) {
+
+        // build card devid and probe it
+        snprintf (devid, sizeof(devid), "hw:%i", card);
+        
+        // open control interface for devid
+        err = snd_ctl_open(&ctlHandle, devid, SND_CTL_READONLY);
+        if (err < 0) continue;   
+        
+        snd_ctl_card_info(ctlHandle, cardinfo);
+        index    = snd_ctl_card_info_get_card(cardinfo);
+
+        // check if short|long name match        
+        if (!strcmp (sndname, snd_ctl_card_info_get_id(cardinfo))) break;
+        if (!strcmp (sndname, snd_ctl_card_info_get_name(cardinfo))) break;
+        if (!strcmp (sndname, snd_ctl_card_info_get_longname(cardinfo))) break;
+    }
+    
+    if (card == MAX_SND_CARD) {
+        afb_req_fail_f (request, "sndcard-notfound", "Fail to find card with name=%s", sndname);
+        goto ExitOnError;
+    }
+    
+    // proxy ctlevent as a binder event        
+    respJson = json_object_new_object();
+    json_object_object_add(respJson, "index"     ,json_object_new_int (index));
+    json_object_object_add(respJson, "devid"     ,json_object_new_string (devid));
+    json_object_object_add(respJson, "shortname" ,json_object_new_string (snd_ctl_card_info_get_name(cardinfo)));
+    json_object_object_add(respJson, "longname"  ,json_object_new_string (snd_ctl_card_info_get_longname(cardinfo)));
+        
+    afb_req_success(request, respJson, NULL);    
+    return;
+    
+  ExitOnError:
+        return;  
+}
+
+
+
+// This function is call when all plugins are loaded
+PUBLIC int alsaLibInit (struct afb_service service) {
+
+    // For future use    
+    srvitf = service;
+    
+    return 0;
+}
\ No newline at end of file
diff --git a/Alsa/core-binding/AlsaLibMapping.h b/AlsaSound/CoreBinding/AlsaLibMapping.h
index 5fc1b98..cd6b409 100644
--- a/Alsa/core-binding/AlsaLibMapping.h
+++ b/AlsaSound/CoreBinding/AlsaLibMapping.h
@@ -34,15 +34,17 @@ typedef int BOOL;
 
 #include <json-c/json.h>
 #include <afb/afb-binding.h>
-
+#include <afb/afb-service-itf.h>
 
 // import from AlsaAfbBinding
 extern const struct afb_binding_interface *afbIface;
 
 // import from AlsaAfbMapping
+PUBLIC int  alsaLibInit (struct afb_service service);
 PUBLIC void alsaGetInfo (struct afb_req request);
 PUBLIC void alsaGetCtl(struct afb_req request);
-PUBLIC void alsaSubCtl (struct afb_req request);
+PUBLIC void alsaSubcribe (struct afb_req request);
+PUBLIC void alsaGetCardId (struct afb_req request);
 
 
 #endif /* ALSALIBMAPPING_H */
diff --git a/Alsa/core-binding/CMakeLists.txt b/AlsaSound/CoreBinding/CMakeLists.txt
index 0475e72..0475e72 100644
--- a/Alsa/core-binding/CMakeLists.txt
+++ b/AlsaSound/CoreBinding/CMakeLists.txt
diff --git a/Alsa/core-binding/README.md b/AlsaSound/CoreBinding/README.md
index 5f0c562..5b6f026 100644
--- a/Alsa/core-binding/README.md
+++ b/AlsaSound/CoreBinding/README.md
@@ -3,8 +3,8 @@
 ------------------------------------------------------------------------
 
 Testing: (from project directory bindings)
- * start binder:  ~/opt/bin/afb-daemon --ldpaths=./build --roothttp=htdocs
- * connect browser on http://localhost:1234
+ * start binder:  ~/opt/bin/afb-daemon --ldpaths=./build --token=mysecret --roothttp=htdocs
+ * connect browser on http://localhost:1234?devid=hw:0
 
  # List Avaliable Sound cards
  http://localhost:1234/api/alsacore/getinfo
@@ -18,3 +18,13 @@ Testing: (from project directory bindings)
  # Get detail on a given control (optional quiet=0=verbose,1,2)
  http://localhost:1234/api/alsacore/getctl?devid=hw:0&numid=1&quiet=0
 
+# Debug event with afb-client-demo
+```
+ ~/opt/bin/afb-client-demo localhost:1234/api?token=mysecret
+ alsacore subscribe {"devid":"hw:0"}
+```
+
+# Open AlsaMixer and play with Volume
+```
+ alsamixer -D hw:0
+```
diff --git a/AlsaSound/HardAbsLayer/CMakeLists.txt b/AlsaSound/HardAbsLayer/CMakeLists.txt
new file mode 100644
index 0000000..e24a9d9
--- /dev/null
+++ b/AlsaSound/HardAbsLayer/CMakeLists.txt
@@ -0,0 +1,23 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+PROJECT(hadware-abstraction-layer C)
+
+
+ADD_SUBDIRECTORY(IntelHda)
+
diff --git a/AlsaSound/HardAbsLayer/IntelHda/CMakeLists.txt b/AlsaSound/HardAbsLayer/IntelHda/CMakeLists.txt
new file mode 100644
index 0000000..0d3f344
--- /dev/null
+++ b/AlsaSound/HardAbsLayer/IntelHda/CMakeLists.txt
@@ -0,0 +1,36 @@
+###########################################################################
+# Copyright 2015, 2016, 2017 IoT.bzh
+#
+# author: Fulup Ar Foll <fulup@iot.bzh>
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+###########################################################################
+
+
+INCLUDE_DIRECTORIES(${include_dirs})
+
+##################################################
+# Inte-HDA sound card Hardware Abstraction Layer
+##################################################
+ADD_LIBRARY(intel-hda-hal MODULE IntelHdaBinding.c IntelHdaLib.c)
+
+SET_TARGET_PROPERTIES(intel-hda-hal PROPERTIES
+	PREFIX ""
+	LINK_FLAGS "-Wl,--version-script=${CMAKE_SOURCE_DIR}/export.map"
+)
+
+TARGET_LINK_LIBRARIES(intel-hda-hal ${link_libraries})
+INSTALL(TARGETS intel-hda-hal
+        LIBRARY DESTINATION ${binding_install_dir})
+
+
diff --git a/AlsaSound/HardAbsLayer/IntelHda/IntelHdaBinding.c b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaBinding.c
new file mode 100644
index 0000000..0452314
--- /dev/null
+++ b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaBinding.c
@@ -0,0 +1,82 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Fulup Ar Foll <fulup@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#define _GNU_SOURCE
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <math.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "IntelHdaLib.h"
+
+PUBLIC const struct afb_binding_interface *afbIface;   
+
+STATIC void localping(struct afb_req request) {
+    json_object *query = afb_req_json(request);
+    afb_req_success(request, query, NULL); 
+}
+
+/*
+ * array of the verbs exported to afb-daemon
+ */
+STATIC const struct afb_verb_desc_v1 binding_verbs[] = {
+  /* VERB'S NAME            SESSION MANAGEMENT          FUNCTION TO CALL         SHORT DESCRIPTION */
+  { .name= "ping"   ,    .session= AFB_SESSION_NONE, .callback= localping,      .info= "Ping Binding" },
+  { .name= "setvolume",  .session= AFB_SESSION_NONE, .callback= intelHdaSetVol,    .info= "Set Volume" },
+  { .name= "getvolume",  .session= AFB_SESSION_NONE, .callback= intelHdaGetVol,    .info= "Get Volume" },
+  { .name= "subscribe",  .session= AFB_SESSION_NONE, .callback= intelHdaSubscribe, .info= "Subscribe AudioBinding Events" },
+  { .name= NULL } /* marker for end of the array */
+};
+
+/*
+ * description of the binding for afb-daemon
+ */
+STATIC const struct afb_binding binding_description = {
+  /* description conforms to VERSION 1 */
+  .type= AFB_BINDING_VERSION_1,
+  .v1= {
+    .prefix= "intel-hda",
+    .info= "Hardware Abstraction Layer for IntelHDA sound card",
+    .verbs = binding_verbs
+  }
+};
+
+// This receive all event this binding subscribe to 
+PUBLIC void afbBindingV1ServiceEvent(const char *evtname, struct json_object *object) {
+  
+    NOTICE (afbIface, "afbBindingV1ServiceEvent evtname=%s [msg=%s]", evtname, json_object_to_json_string(object));
+}
+
+// this is call when after all bindings are loaded
+PUBLIC int afbBindingV1ServiceInit(struct afb_service service) {
+    
+   return (intelHdaInit(service, binding_description.v1.prefix)); 
+};
+
+/*
+ * activation function for registering the binding called by afb-daemon
+ */
+PUBLIC const struct afb_binding *afbBindingV1Register(const struct afb_binding_interface *itf) {
+    afbIface= itf;
+    return &binding_description;	/* returns the description of the binding */
+}
+
diff --git a/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.c b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.c
new file mode 100644
index 0000000..ad4fcf4
--- /dev/null
+++ b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.c
@@ -0,0 +1,138 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Fulup Ar Foll <fulup@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * reference: 
+ *   amixer contents; amixer controls;
+ *   http://www.tldp.org/HOWTO/Alsa-sound-6.html 
+ */
+#define _GNU_SOURCE  // needed for vasprintf
+#include <stdio.h>
+#include <string.h>
+#include <unistd.h>
+#include <errno.h>
+#include <netdb.h>
+#include <fcntl.h>
+#include <math.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "IntelHdaLib.h"
+#include "AlsaMixerHal.h"
+
+static struct afb_service srvitf;
+
+// Normalise Intel-HDA numid    
+static AlsaHalMapT  alsaCtlsMap[]= { // check with amixer -D hw:xx controls; amixer -D "hw:3" cget numid=xx
+ /* ACTION(enum) NUMID(int) IFACE(enum) VALUES(int) MinVal(int) MaxVal(int) Step(int) ACL=READ|WRITE|RW INFO=comment */
+  { .action=Master_Playback_Volume, .numid=16, .group=OUTVOL, .values=1, .minval=0, .maxval= 87 , .step=0, .acl=RW, .info= "Master Playback Volume" },
+  { .action=PCM_Playback_Volume   , .numid=27, .group=PCMVOL, .values=2, .minval=0, .maxval= 255, .step=0, .acl=RW, .info= "PCM Playback Volume" },
+  { .action=PCM_Playback_Switch   , .numid=17, .group=SWITCH, .values=1, .minval=0, .maxval= 1  , .step=0, .acl=RW, .info= "Master Playback Switch" },
+  { .action=Capture_Volume        , .numid=12, .group=INVOL , .values=2, .minval=0, .maxval= 31 , .step=0, .acl=RW, .info= "Capture Volume" },
+  { .numid=0  } /* marker for end of the array */
+} ;
+
+// Warning: Longname is used to locate board on the system
+static AlsaHalSndT alsaSndCard  = {
+    .longname= "HDA Intel PCH",
+    .info    = "Hardware Abstraction Layer for IntelHDA sound card",
+    .ctls    = alsaCtlsMap,
+};
+
+
+// This callback is fired when afb_service_call for api/alsacore/subctl returns
+STATIC void alsaSubcribeCB (void *handle, int iserror, struct json_object *result) {
+	struct afb_req request = afb_req_unstore(handle);
+        struct json_object *x, *resp = NULL;
+	const char *info = NULL;
+
+	if (result) {
+	    INFO (afbIface, "result=[%s]\n", json_object_to_json_string (result));
+            if (json_object_object_get_ex(result, "request", &x) && json_object_object_get_ex(x, "info", &x))
+            info = json_object_get_string(x);
+            if (!json_object_object_get_ex(result, "response", &resp)) resp = NULL;
+        }
+        
+        // push message respond
+	if (iserror) afb_req_fail_f(request,  "Fail", info);
+	else         afb_req_success(request, resp, info);
+        
+        // free calling request
+	afb_req_unref(request);
+}
+
+// Create and subscribe to alsacore ctl events
+PUBLIC void intelHdaMonitor(struct afb_req request) {
+    
+    // save request in session as it might be used after return by callback
+    struct afb_req *handle = afb_req_store(request);
+
+    // push request to low level binding
+    if (!handle) afb_req_fail(request, "error", "out of memory");
+    else    afb_service_call(srvitf, "alsacore", "subctl", json_object_get(afb_req_json(request)), alsaSubcribeCB, handle);
+
+    // success/failure messages return from callback    
+}
+
+// Subscribe to AudioBinding events
+PUBLIC void intelHdaSubscribe (struct afb_req request) {
+    const char *devid = afb_req_value(request, "devid");
+    if (devid == NULL) {
+        afb_req_fail_f (request, "devid-missing", "devid=hw:xxx missing");
+    }
+    
+}
+
+
+// Call when all bindings are loaded and ready to accept request
+PUBLIC void intelHdaGetVol(struct afb_req request) {
+   
+    // Should call here Hardware Alsa Abstraction Layer for corresponding Sound Card
+    afb_req_success (request, NULL, NULL);
+    return;
+    
+}
+
+PUBLIC void intelHdaSetVol(struct afb_req request) {
+    const char *arg;
+    char *pcm;
+    
+    arg = afb_req_value(request, "vol");
+    if (arg == NULL) {
+        afb_req_fail_f (request, "argument-missing", "vol=[0,100] missing");
+        goto ExitOnError;
+    }
+    
+    arg = afb_req_value(request, "pcm");
+    if (arg == NULL) pcm="Master";
+   
+    // Should call here Hardware Alsa Abstraction Layer for corresponding Sound Card
+    afb_req_success (request, NULL, NULL);
+    return;
+    
+  ExitOnError:
+    return;
+    
+}
+
+
+// this function is call after all binder are loaded and initialised
+PUBLIC int  intelHdaInit (struct afb_service service, const char *cardname) {
+    srvitf = service;
+    
+    // API prefix is used as sndcard halname
+    alsaSndCard.halname= cardname;
+    return 0;
+}
\ No newline at end of file
diff --git a/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.h b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.h
new file mode 100644
index 0000000..edf9474
--- /dev/null
+++ b/AlsaSound/HardAbsLayer/IntelHda/IntelHdaLib.h
@@ -0,0 +1,49 @@
+/*
+ * AlsaLibMapping -- provide low level interface with AUDIO lib (extracted from alsa-json-gateway code)
+ * Copyright (C) 2015,2016,2017, Fulup Ar Foll fulup@iot.bzh
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+
+// few coding convention
+typedef int BOOL;
+#ifndef PUBLIC
+  #define PUBLIC
+#endif
+#ifndef FALSE
+  #define FALSE 0
+#endif
+#ifndef TRUE
+  #define TRUE 1
+#endif
+#define STATIC    static
+ 
+#ifndef AUDIOLIBMAPPING_H
+#define AUDIOLIBMAPPING_H
+
+#include <json-c/json.h>
+#include <afb/afb-binding.h>
+#include <afb/afb-service-itf.h>
+
+// import from AlsaAfbBinding
+extern const struct afb_binding_interface *afbIface;
+
+// import from AlsaAfbMapping
+PUBLIC void intelHdaSetVol (struct afb_req request);
+PUBLIC void intelHdaGetVol(struct afb_req request);
+PUBLIC void intelHdaSubscribe(struct afb_req request);
+PUBLIC int  intelHdaInit (struct afb_service service, const char *cardname);
+
+#endif /* AUDIOLIBMAPPING_H */
+
diff --git a/AlsaSound/include/AlsaMixerHal.h b/AlsaSound/include/AlsaMixerHal.h
new file mode 100644
index 0000000..399f8ab
--- /dev/null
+++ b/AlsaSound/include/AlsaMixerHal.h
@@ -0,0 +1,71 @@
+/*
+ * Copyright (C) 2016 "IoT.bzh"
+ * Author Fulup Ar Foll <fulup@iot.bzh>
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ * 
+ * reference: 
+ *   amixer contents; amixer controls;
+ *   http://www.tldp.org/HOWTO/Alsa-sound-6.html 
+ */
+
+
+#ifndef ALSAMIXERMAP_H
+#define ALSAMIXERMAP_H
+
+// Most controls are MIXER but some vendor specific are possible
+typedef enum {
+    OUTVOL,
+    PCMVOL,
+    INVOL,
+    SWITCH,
+    ROUTE,
+    CARD,
+} groupEnum;
+
+typedef enum {
+    READ,
+    WRITE,
+    RW,
+} aclEnum;
+
+typedef enum {
+   Master_Playback_Volume,
+   PCM_Playback_Volume,
+   PCM_Playback_Switch,
+   Capture_Volume,
+} actionEnum;
+
+typedef const struct {
+    actionEnum action;
+    int numid;
+    groupEnum group;
+    int values;
+    int minval;
+    int maxval;
+    int step;
+    char* info;
+    aclEnum acl;
+    
+} AlsaHalMapT;
+
+typedef struct  {
+    const char  *halname;
+    const char  *longname;
+    const char  *info;
+    AlsaHalMapT *ctls;
+    
+} AlsaHalSndT;
+
+#endif /* ALSAMIXERMAP_H */
+
diff --git a/AudioLogic/AudioLogicBinding.c b/AudioLogic/AudioLogicBinding.c
index 65943c0..1220f29 100644
--- a/AudioLogic/AudioLogicBinding.c
+++ b/AudioLogic/AudioLogicBinding.c
@@ -26,7 +26,7 @@
 #include <sys/time.h>
 #include <sys/types.h>
 
-#define _GNU_SOURCE  // needed for vasprintf
+#include "AlsaMixerHal.h"
 #include "AudioLogicLib.h"
 
 PUBLIC const struct afb_binding_interface *afbIface;   
@@ -36,15 +36,19 @@ STATIC void localping(struct afb_req request) {
     afb_req_success(request, query, NULL); 
 }
 
+
 /*
  * array of the verbs exported to afb-daemon
  */
 STATIC const struct afb_verb_desc_v1 binding_verbs[] = {
   /* VERB'S NAME            SESSION MANAGEMENT          FUNCTION TO CALL         SHORT DESCRIPTION */
-  { .name= "ping"   ,    .session= AFB_SESSION_NONE, .callback= localping,      .info= "Ping Binding" },
-  { .name= "setvolume",  .session= AFB_SESSION_NONE, .callback= audioLogicSetVol,    .info= "Set Volume" },
-  { .name= "getvolume",  .session= AFB_SESSION_NONE, .callback= audioLogicGetVol,    .info= "Get Volume" },
-  { .name= "monitor",    .session= AFB_SESSION_NONE, .callback= audioLogicMonitor,   .info= "Subscribe Volume Events" },
+  { .name= "ping"   ,    .session= AFB_SESSION_NONE,  .callback= localping,      .info= "Ping Binding" },
+  { .name= "setvolume",  .session= AFB_SESSION_CHECK, .callback= audioLogicSetVol,    .info= "Set Volume" },
+  { .name= "getvolume",  .session= AFB_SESSION_CHECK, .callback= audioLogicGetVol,    .info= "Get Volume" },
+  { .name= "subscribe",  .session= AFB_SESSION_CHECK, .callback= audioLogicSubscribe, .info= "Subscribe AudioBinding Events" },
+  { .name= "monitor",    .session= AFB_SESSION_CHECK, .callback= audioLogicMonitor,   .info= "Activate AlsaCtl Monitoring" },
+  { .name= "open",       .session= AFB_SESSION_CREATE,.callback= audioLogicOpen,      .info= "Open a Dedicated SoundCard" },
+  { .name= "close",      .session= AFB_SESSION_CLOSE, .callback= audioLogicClose,     .info= "Close previously open SoundCard" },
   { .name= NULL } /* marker for end of the array */
 };
 
diff --git a/AudioLogic/AudioLogicLib.c b/AudioLogic/AudioLogicLib.c
index ebe241c..857cc9f 100644
--- a/AudioLogic/AudioLogicLib.c
+++ b/AudioLogic/AudioLogicLib.c
@@ -29,12 +29,34 @@
 #include "AudioLogicLib.h"
 static struct afb_service srvitf;
 
-#define _GNU_SOURCE  // needed for vasprintf
 
-// this function is call after all binder are loaded and initialised
-PUBLIC int audioLogicInit (struct afb_service service) {
-    srvitf = service;
-    return 0;
+PUBLIC void audioLogicSetVol(struct afb_req request) {
+   
+    const char *vol = afb_req_value(request, "vol");
+    if (vol == NULL) {
+        afb_req_fail_f (request, "argument-missing", "vol=+-%[0,100] missing");
+        goto ExitOnError;
+    }
+    
+    switch (vol[0]) {
+        case '+':
+            break;
+        case '-':
+            break;
+        case '%':
+            break;
+        
+        default:
+           afb_req_fail_f (request, "value-invalid", "volume should be (+-%[0-100]xxx) vol=%s", vol);
+           goto ExitOnError;  
+    }
+    
+    // Should call here Hardware Alsa Abstraction Layer for corresponding Sound Card
+    afb_req_success (request, NULL, NULL);
+    return;
+    
+    ExitOnError:
+        return;  
 }
 
 // This callback is fired when afb_service_call for api/alsacore/subctl returns
@@ -46,44 +68,139 @@ STATIC void alsaSubcribeCB (void *handle, int iserror, struct json_object *resul
 	if (result) {
 	    INFO (afbIface, "result=[%s]\n", json_object_to_json_string (result));
             if (json_object_object_get_ex(result, "request", &x) && json_object_object_get_ex(x, "info", &x))
-		info = json_object_get_string(x);
-		if (!json_object_object_get_ex(result, "response", &resp)) resp = NULL;
-	}
+            info = json_object_get_string(x);
+            if (!json_object_object_get_ex(result, "response", &resp)) resp = NULL;
+        }
         
         // push message respond
 	if (iserror) afb_req_fail_f(request,  "Fail", info);
 	else         afb_req_success(request, resp, info);
         
-        // free calling request
-	afb_req_unref(request);
 }
 
 // Create and subscribe to alsacore ctl events
 PUBLIC void audioLogicMonitor(struct afb_req request) {
     
-    // save request in session as it might be used after return by callback
+    // keep request for callback to respond
     struct afb_req *handle = afb_req_store(request);
-
+    
+    // get client context
+    AudioLogicCtxT *ctx = afb_req_context_get(request);
+    
     // push request to low level binding
-    if (!handle) afb_req_fail(request, "error", "out of memory");
-    else    afb_service_call(srvitf, "alsacore", "subctl", json_object_get(afb_req_json(request)), alsaSubcribeCB, handle);
+    NOTICE (afbIface, "audioLogicMonitor ctx->devid=%s [ctx->queryurl=%s]", ctx->devid, json_object_to_json_string(ctx->queryurl));
+    
+    if (ctx->queryurl) {
+        json_object_get (ctx->queryurl); // Make sure usage count does not fall to zero
+        afb_service_call(srvitf, "alsacore", "subscribe", ctx->queryurl, alsaSubcribeCB, handle);
+    }
+    
+    else afb_req_fail_f(request,  "context-invalid", "No valid queryurl in client context");
 
     // success/failure messages return from callback    
 }
 
+// Subscribe to AudioBinding events
+PUBLIC void audioLogicSubscribe (struct afb_req request) {
+   
+        return;
+}
+
+
 // Call when all bindings are loaded and ready to accept request
 PUBLIC void audioLogicGetVol(struct afb_req request) {
    
+    // Should call here Hardware Alsa Abstraction Layer for corresponding Sound Card
     afb_req_success (request, NULL, NULL);
     return;
     
 }
 
-PUBLIC void audioLogicSetVol(struct afb_req request) {
-   
+// This callback is fired when afb_service_call for api/alsacore/subctl returns
+STATIC void audioLogicOpenCB (void *handle, int iserror, struct json_object *result) {
+    struct afb_req request = afb_req_unstore(handle);
+    struct json_object *response;
+    //INFO (afbIface, "result=[%s]\n", json_object_to_json_string (result));
 
-    afb_req_success (request, NULL, NULL);
-    return;
+
+    if (iserror) { // on error proxy information we got from lower layer
+        if (result) {
+            struct json_object *status, *info;
+        
+            if (json_object_object_get_ex(result,   "request", &response)) {
+                json_object_object_get_ex(response, "info"  , &info);
+                json_object_object_get_ex(response, "status", &status);
+                afb_req_fail(request, json_object_get_string(status), json_object_get_string(info));
+                goto OnExit;
+            }
+        } else {
+            afb_req_fail(request,  "Fail", "Unknown Error" );
+        }
+        goto OnExit;
+    }    
+    
+    // Get response from object
+    json_object_object_get_ex(result, "response", &response);
+    if (response) {
+        struct json_object *subobj;
+        
+        // attach client context to session
+        AudioLogicCtxT *ctx = malloc (sizeof(AudioLogicCtxT));
+        
+        // extract information from Json Alsa Object 
+        json_object_object_get_ex(response, "cardid", &subobj);
+        if (subobj) ctx->cardid= json_object_get_int(subobj);
+        
+        // store devid as an object for further alsa request
+        json_object_object_get_ex(response, "devid", &subobj);
+        if (subobj) ctx->devid= strdup(json_object_get_string(subobj));        
+        
+        json_object_object_get_ex(response, "shortname", &subobj);
+        if (subobj)ctx->shortname=strdup(json_object_get_string(subobj));
+        
+        json_object_object_get_ex(response, "longname", &subobj);
+        if (subobj)ctx->longname=strdup(json_object_get_string(subobj));
     
+        // add AudioLogicCtxT to Client Session
+        NOTICE (afbIface, "audioLogicOpen ctx->devid=[%s]", ctx->devid);
+                
+        // save queryurl with devid only for further ALSA request
+        ctx->queryurl=json_object_new_object();
+        json_object_object_add(ctx->queryurl, "devid",json_object_new_string(ctx->devid));
+
+        afb_req_context_set(request, ctx, free);
+    }
+
+    // release original calling request
+    afb_req_success(request, response, NULL);
+
+    
+  OnExit:
+    afb_req_unref(request);
+    return;
 }
 
+// Delegate to lowerlevel the mapping of soundcard name with soundcard ID
+PUBLIC void audioLogicOpen(struct afb_req request) {
+
+    // Delegate query to lower level
+    struct afb_req *handle = afb_req_store(request);
+    if (!handle) afb_req_fail(request, "error", "out of memory");
+    else afb_service_call(srvitf, "alsacore", "getCardId", json_object_get(afb_req_json(request)), audioLogicOpenCB, handle);
+}
+
+// Free client context create from audioLogicOpenCB
+PUBLIC void audioLogicClose (struct afb_req request) {
+  
+    // retrieve current client context to print debug info
+    AudioLogicCtxT *ctx = (AudioLogicCtxT*) afb_req_context_get(request);
+    DEBUG (afbIface, "audioLogicClose cardid=%d devid=%s shortname=%s longname=%s", ctx->cardid, ctx->devid, ctx->shortname, ctx->longname);
+}
+
+
+// this function is call after all binder are loaded and initialised
+PUBLIC int audioLogicInit (struct afb_service service) {
+    srvitf = service;
+    
+    return 0;
+}
diff --git a/AudioLogic/AudioLogicLib.h b/AudioLogic/AudioLogicLib.h
index 21513fd..8530360 100644
--- a/AudioLogic/AudioLogicLib.h
+++ b/AudioLogic/AudioLogicLib.h
@@ -40,10 +40,24 @@ typedef int BOOL;
 // import from AlsaAfbBinding
 extern const struct afb_binding_interface *afbIface;
 
+
+// This structure hold private data for a given client of binding
+typedef struct {
+ 
+  int  cardid;
+  const char  *devid;
+  const char  *shortname;
+  const char  *longname;
+  json_object *queryurl;
+} AudioLogicCtxT;
+
 // import from AlsaAfbMapping
 PUBLIC void audioLogicSetVol (struct afb_req request);
 PUBLIC void audioLogicGetVol(struct afb_req request);
 PUBLIC void audioLogicMonitor(struct afb_req request);
+PUBLIC void audioLogicOpen(struct afb_req request);
+PUBLIC void audioLogicClose(struct afb_req request);
+PUBLIC void audioLogicSubscribe(struct afb_req request);
 PUBLIC int  audioLogicInit (struct afb_service service);
 
 #endif /* AUDIOLIBMAPPING_H */
diff --git a/AudioLogic/README.md b/AudioLogic/README.md
index 399f905..fa50173 100644
--- a/AudioLogic/README.md
+++ b/AudioLogic/README.md
@@ -3,16 +3,33 @@
 ------------------------------------------------------------------------
 
 Testing: (from project directory bindings)
- * start binder:  ~/opt/bin/afb-daemon --ldpaths=./build --roothttp=htdocs
- * connect browser on http://localhost:1234
+ * start binder:  ~/opt/bin/afb-daemon --ldpaths=./build --token=mysecret --roothttp=htdocs
+ * connect browser on http://localhost:1234?devid=hw:0
+
+ # Open Sound Card from its name
+ http://localhost:1234/api/audio/open?token=mysecret&sndname=H650e
 
  # Subscribe event for a given board
- http://localhost:1234/api/audio/subscribe?devid=hw:0
+ http://localhost:1234/api/audio/subscribe?token=mysecret&devid=hw:0
 
  # Increase Volume
- http://localhost:1234/api/audio/setvol?devid=hw:0&pcm=master&vol=50%
+ http://localhost:1234/api/audio/setvol?token=mysecret&devid=hw:0&pcm=master&vol=50%
 
  # Get Volume
- http://localhost:1234/api/audio/getvol?devid=hw:0&pcm=master
+ http://localhost:1234/api/audio/getvol?token=mysecret&devid=hw:0&pcm=master
+
+ # Close Session
+ http://localhost:1234/api/audio/close?token=mysecret
+
+
+Testing with afb-client-demo
 
- 
\ No newline at end of file
+```
+~/opt/bin/afb-client-demo localhost:1234/api?token=mysecret
+alsacore subctl {"devid":"hw:0"}
+```
+ 
+Start AlsaMixer and change volume
+```
+alsamixer -D hw:0
+```
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3f120e8..56b5f09 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -98,7 +98,7 @@ ENDIF(CMAKE_BUILD_TYPE MATCHES Debug)
 
 SET(include_dirs
 	${INCLUDE_DIRS}
-	${CMAKE_SOURCE_DIR}/include
+	${CMAKE_SOURCE_DIR}/AlsaSound/include
 	${json-c_INCLUDE_DIRS}
 	${afb-daemon_INCLUDE_DIRS}
 	)
@@ -110,6 +110,6 @@ SET(link_libraries
 
 # Bindings to compile
 # --------------------
-add_subdirectory(Alsa)
+add_subdirectory(AlsaSound)
 add_subdirectory(AudioLogic)
 add_subdirectory(htdocs)
diff --git a/README.md b/README.md
index b33f843..10b7780 100644
--- a/README.md
+++ b/README.md
@@ -63,5 +63,9 @@ ls
 # Start the binder
 afb-daemon --token=x --ldpaths=$INSTALL_DIR/lib/audio --port=1234 --roothttp=$INSTALL_DIR/htdocs/audio-bindings --verbose
 ```
+Start a browser on http://localhost:1234?devid=hw:0
 
-
+Start AlsaMixer and change volume you should see event in your browser
+```
+alsamixer -D hw:0
+```
\ No newline at end of file
diff --git a/htdocs/AFB-websock.js b/htdocs/AFB-websock.js
new file mode 100644
index 0000000..f904a58
--- /dev/null
+++ b/htdocs/AFB-websock.js
@@ -0,0 +1,172 @@
+AFB = function(base, initialtoken){
+
+var urlws = "ws://"+window.location.host+"/"+base;
+var urlhttp = "http://"+window.location.host+"/"+base;
+
+/*********************************************/
+/****                                     ****/
+/****             AFB_context             ****/
+/****                                     ****/
+/*********************************************/
+var AFB_context;
+{
+	var UUID = undefined;
+	var TOKEN = initialtoken;
+
+	var context = function(token, uuid) {
+		this.token = token;
+		this.uuid = uuid;
+	}
+
+	context.prototype = {
+		get token() {return TOKEN;},
+		set token(tok) {if(tok) TOKEN=tok;},
+		get uuid() {return UUID;},
+		set uuid(id) {if(id) UUID=id;}
+	};
+
+	AFB_context = new context();
+}
+/*********************************************/
+/****                                     ****/
+/****             AFB_websocket           ****/
+/****                                     ****/
+/*********************************************/
+var AFB_websocket;
+{
+	var CALL = 2;
+	var RETOK = 3;
+	var RETERR = 4;
+	var EVENT = 5;
+
+	var PROTO1 = "x-afb-ws-json1";
+
+	AFB_websocket = function(onopen, onabort) {
+		var u = urlws;
+		if (AFB_context.token) {
+			u = u + '?x-afb-token=' + AFB_context.token;
+			if (AFB_context.uuid)
+				u = u + '&x-afb-uuid=' + AFB_context.uuid;
+		}
+		this.ws = new WebSocket(u, [ PROTO1 ]);
+		this.pendings = {};
+		this.awaitens = {};
+		this.counter = 0;
+		this.ws.onopen = onopen.bind(this);
+		this.ws.onerror = onerror.bind(this);
+		this.ws.onclose = onclose.bind(this);
+		this.ws.onmessage = onmessage.bind(this);
+		this.onopen = onopen;
+		this.onabort = onabort;
+	}
+
+	function onerror(event) {
+		var f = this.onabort;
+		if (f) {
+			delete this.onopen;
+			delete this.onabort;
+			f && f(this);
+		}
+		this.onerror && this.onerror(this);
+	}
+
+	function onopen(event) {
+		var f = this.onopen;
+		delete this.onopen;
+		delete this.onabort;
+		f && f(this);
+	}
+
+	function onclose(event) {
+		for (var id in this.pendings) {
+			var ferr = this.pendings[id].onerror;
+			ferr && ferr(null, this);
+		}
+		this.pendings = {};
+		this.onclose && this.onclose();
+	}
+
+	function fire(awaitens, name, data) {
+		var a = awaitens[name];
+		if (a)
+			a.forEach(function(handler){handler(data);});
+		var i = name.indexOf("/");
+		if (i >= 0) {
+			a = awaitens[name.substring(0,i)];
+			if (a)
+				a.forEach(function(handler){handler(data);});
+		}
+		a = awaitens["*"];
+		if (a)
+			a.forEach(function(handler){handler(data);});
+	}
+
+	function reply(pendings, id, ans, offset) {
+		if (id in pendings) {
+			var p = pendings[id];
+			delete pendings[id];
+			var f = p[offset];
+			f(ans);
+		}
+	}
+
+	function onmessage(event) {
+		var obj = JSON.parse(event.data);
+		var code = obj[0];
+		var id = obj[1];
+		var ans = obj[2];
+		AFB_context.token = obj[3];
+		switch (code) {
+		case RETOK:
+			reply(this.pendings, id, ans, 0);
+			break; 
+		case RETERR:
+			reply(this.pendings, id, ans, 1);
+			break; 
+		case EVENT:
+		default:
+			fire(this.awaitens, id, ans);
+			break; 
+		}
+	}
+
+	function close() {
+		this.ws.close();
+	}
+
+	function call(method, request) {
+		return new Promise((function(resolve, reject){
+			var id, arr;
+			do {
+			   id = String(this.counter = 4095 & (this.counter + 1));
+			} while (id in this.pendings);
+			this.pendings[id] = [ resolve, reject ];
+			arr = [CALL, id, method, request ];
+			if (AFB_context.token) arr.push(AFB_context.token);
+			this.ws.send(JSON.stringify(arr));
+		}).bind(this));
+	}
+
+	function onevent(name, handler) {
+		var id = name;
+		var list = this.awaitens[id] || (this.awaitens[id] = []);
+		list.push(handler);
+	}
+
+	AFB_websocket.prototype = {
+		close: close,
+		call: call,
+		onevent: onevent
+	};
+}
+/*********************************************/
+/****                                     ****/
+/****                                     ****/
+/****                                     ****/
+/*********************************************/
+return {
+	context: AFB_context,
+	ws: AFB_websocket
+};
+};
+
diff --git a/htdocs/AudioBinding.js b/htdocs/AudioBinding.js
new file mode 100644
index 0000000..a1267b1
--- /dev/null
+++ b/htdocs/AudioBinding.js
@@ -0,0 +1,67 @@
+    var afb = new AFB("api", "mysecret");
+    var ws;
+    var evtidx=0;
+
+    function getParameterByName(name, url) {
+        if (!url) {
+          url = window.location.href;
+        }
+        name = name.replace(/[\[\]]/g, "\\$&");
+        var regex = new RegExp("[?&]" + name + "(=([^&#]*)|&|#|$)"),
+            results = regex.exec(url);
+        if (!results) return null;
+        if (!results[2]) return '';
+        return decodeURIComponent(results[2].replace(/\+/g, " "));
+    }
+    
+    // default soundcard is hw:0
+    var devid=getParameterByName("devid");
+    if (!devid) devid="hw:0";
+    
+    var sndname=getParameterByName("sndname");
+    if (!sndname) sndname="PCH";
+    
+    function init() {
+            ws = new afb.ws(onopen, onabort);
+    }
+
+    function onopen() {
+            document.getElementById("main").style.visibility = "visible";
+            document.getElementById("connected").innerHTML = "Binder WS Active";
+            document.getElementById("connected").style.background  = "lightgreen";
+            ws.onevent("*", gotevent);
+    }
+    
+    function onabort() {
+            document.getElementById("main").style.visibility = "hidden";
+            document.getElementById("connected").innerHTML = "Connected Closed";
+            document.getElementById("connected").style.background  = "red";
+
+    }
+    
+    function replyok(obj) {
+            console.log("replyok:" + JSON.stringify(obj));
+            document.getElementById("output").innerHTML = "OK: "+JSON.stringify(obj);
+    }
+    
+    function replyerr(obj) {
+            console.log("replyerr:" + JSON.stringify(obj));
+            document.getElementById("output").innerHTML = "ERROR: "+JSON.stringify(obj);
+    }
+    
+    function gotevent(obj) {
+            console.log("gotevent:" + JSON.stringify(obj));
+            document.getElementById("outevt").innerHTML = (evtidx++) +": "+JSON.stringify(obj);
+    }
+    
+    function send(message) {
+            var api = document.getElementById("api").value;
+            var verb = document.getElementById("verb").value;
+            ws.call(api+"/"+verb, {data:message}).then(replyok, replyerr);
+    }
+    
+    
+    function callbinder(api, verb, query) {
+            console.log ("subscribe api="+api+" verb="+verb+" query=" +query);
+            ws.call(api+"/"+verb, query).then(replyok, replyerr);
+    }
\ No newline at end of file
diff --git a/htdocs/README.md b/htdocs/README.md
index 6468356..79b57d8 100644
--- a/htdocs/README.md
+++ b/htdocs/README.md
@@ -1,5 +1,5 @@
 ------------------------------------------------------------------------
-   Simple HTML test
+   Basic HTML & WS test
 ------------------------------------------------------------------------
   
   # Load bindings directly from development tree for debug
diff --git a/htdocs/alsa-core.html b/htdocs/alsa-core.html
index 0969b6f..9d0fd83 100644
--- a/htdocs/alsa-core.html
+++ b/htdocs/alsa-core.html
@@ -2,41 +2,23 @@
 <head>
     <title>Hello world test</title>
     
-    <script type="text/javascript" src="websock.js"></script>
-    <script type="text/javascript">
-	var ws;
+    <script type="text/javascript" src="AFB-websock.js"></script>
+    <script type="text/javascript" src="AudioBinding.js"></script>
 
-	function onopen() {
-		document.getElementById("main").style.visibility = "visible";
-		document.getElementById("connected").innerHTML = "WebSocket Open";
-	}
-	function onabort() {
-		document.getElementById("main").style.visibility = "hidden";
-		document.getElementById("connected").innerHTML = "Connected Closed";
-	}
-	function init() {
-		ws = new AfbWsItf("api", onopen, onabort, new AfbCtxItf("mysecret"));
-	}
-	function replyok(obj) {
-		document.getElementById("output").innerHTML = "OK: "+JSON.stringify(obj);
-	}
-	function replyerr(obj) {
-		document.getElementById("output").innerHTML = "ERROR: "+JSON.stringify(obj);
-	}
-	function subscribe(devid) {
-                ws.call("alsacore", "subctl", {devid:devid}, replyok, replyerr);
-	}
-    </script>
-    
 <body onload="init();">
     <h1>Hello world test</h1>
+    <button id="connected">Binder WS Fail</button></li>
+    <br>
     <ol>
-     <li><a href="api/alsacore/getinfo">getinfo: List Sound Cards</a>
-     <li><a href="api/alsacore/getinfo?devid=hw:0">Card info about hw:0</a>
-     <li><a href="api/alsacore/getctl?devid=hw:0">List controls for hw:0 (quiet)</a>
-     <li><a href="api/alsacore/getctl?devid=hw:0&quiet=0">List controls for hw:0 (verbose)</a>
-     <li><a href="api/alsacore/getctl?devid=hw:0&numid=1&quiet=0">return control numid=1 for hw:0</a>
-     <li><button id="connected" onclick="subscribe('hw:0')">Click to Connected</button></li>
+    <li><a href="api/alsacore/getinfo">getinfo: List Sound Cards</a>
+    <li><a href="api/alsacore/getinfo?devid=hw:0">Card info about hw:0</a>
+    <li><a href="api/alsacore/getctl?devid=hw:0">List controls for hw:0 (quiet)</a>
+    <li><a href="api/alsacore/getctl?devid=hw:0&quiet=0">List controls for hw:0 (verbose)</a>
+    <li><a href="api/alsacore/getctl?devid=hw:0&numid=1&quiet=0">return control numid=1 for hw:0</a>
+    <br>    
+    <li><button onclick="callbinder('alsacore','subscribe', {devid:devid})">Subscribe AlsaCtl Events</button></li>
+    <br>    
     <div id="main" style="visibility:hidden">
     Server says... <div id="output"></div>
+    Events: <div id="outevt"></div>
     </div>    
diff --git a/htdocs/audio-logic.html b/htdocs/audio-logic.html
index ff806ad..79ab114 100644
--- a/htdocs/audio-logic.html
+++ b/htdocs/audio-logic.html
@@ -2,39 +2,28 @@
 <head>
     <title>Hello world test</title>
     
-    <script type="text/javascript" src="websock.js"></script>
-    <script type="text/javascript">
-	var ws;
-
-	function onopen() {
-		document.getElementById("main").style.visibility = "visible";
-		document.getElementById("connected").innerHTML = "WebSocket Open";
-	}
-	function onabort() {
-		document.getElementById("main").style.visibility = "hidden";
-		document.getElementById("connected").innerHTML = "Connected Closed";
-	}
-	function init() {
-		ws = new AfbWsItf("api", onopen, onabort, new AfbCtxItf("mysecret"));
-	}
-	function replyok(obj) {
-		document.getElementById("output").innerHTML = "OK: "+JSON.stringify(obj);
-	}
-	function replyerr(obj) {
-		document.getElementById("output").innerHTML = "ERROR: "+JSON.stringify(obj);
-	}
-	function subscribe(devid) {
-                ws.call("alsacore", "subctl", {devid:devid}, replyok, replyerr);
-	}
-    </script>
+    <script type="text/javascript" src="AFB-websock.js"></script>
+    <script type="text/javascript" src="AudioBinding.js"></script>
     
 <body onload="init();">
     <h1>Hello world test</h1>
+    <button id="connected">Binder WS Fail</button></li>
+    <br>
     <ol>
-     <li><a href="api/audio/setvol?devid=hw:0&pcm=master&vol=50%">Set Master PCM volume to 50%</a>
-     <li><a href="api/audio/getvol?devid=hw:0&pcm=master">Get Master PCM volume</a>
-     <li><a href="api/alsacore/monitor?devid=hw:0">Activate devid=hw:0 monitoring</a>
-     <li><button id="connected" onclick="subscribe('hw:0')">Click to Subscribe</button></li>
+    <li><button onclick="callbinder('audio','open',{sndname: sndname})">Open SndCard</button></li>
+    <br>
+    <li><button onclick="callbinder('audio','setvol', {pcm:'master', vol='+10'})">Increase +10 Master</button></li>
+    <li><button onclick="callbinder('audio','setvol', {pcm:'master', vol='-10'})">Decrease -10 Master</button></li>
+    <li><button onclick="callbinder('audio','setvol', {pcm:'master', vol='%50'})">SetVol %50 Master</button></li>
+    <li><button onclick="callbinder('audio','getvol', {pcm:'master'})">GetVolume Master</button></li>
+    <br>
+    <li><button onclick="callbinder('audio','monitor')">Monitor LowLevel Events</button></li>
+    <li><button onclick="callbinder('audio','subscribe')">Subscribe AudioBinding Events</button></li>
+    <br>
+    <li><button onclick="callbinder('audio','close')">Close SndCard</button></li>
+
+    <br>
     <div id="main" style="visibility:hidden">
     Server says... <div id="output"></div>
+    Events: <div id="outevt"></div>
     </div>    
diff --git a/htdocs/websock.js b/htdocs/websock.js
deleted file mode 100644
index c429553..0000000
--- a/htdocs/websock.js
+++ /dev/null
@@ -1,117 +0,0 @@
-
-AfbCtxItf = (function(){
-
-	var UUID = undefined;
-	var TOKEN = undefined;
-
-	function AfbCtxItf(token, uuid) {
-		this.token = token;
-		this.uuid = uuid;
-	}
-
-	AfbCtxItf.prototype = {
-		get token() {return TOKEN;},
-		set token(tok) {if(tok) TOKEN=tok;},
-		get uuid() {return UUID;},
-		set uuid(id) {if(id) UUID=id;}
-	};
-
-	return AfbCtxItf;
-})();
-
-
-AfbWsItf = (function(){
-
-	var CALL = 2;
-	var RETOK = 3;
-	var RETERR = 4;
-
-	function AfbWsItf(base, onopen, onabort, ctx) {
-		ctx = ctx || new AfbCtxItf();
-		var wl = window.location;
-		var u = "ws://"+wl.host+"/"+base;
-		if (ctx.token) {
-			u = u + '?x-afb-token=' + ctx.token;
-			if (ctx.uuid)
-				u = u + '&x-afb-uuid=' + ctx.uuid;
-		}
-		this.ws = new (WebSocket || MozWebSocket)(u, [ "x-afb-ws-json1" ]);
-		this.pendings = {};
-		this.counter = 0;
-		this.ctx = ctx;
-		this.ws.onopen = onopen.bind(this);
-		this.ws.onerror = onerror.bind(this);
-		this.ws.onclose = onclose.bind(this);
-		this.ws.onmessage = onmessage.bind(this);
-		this.onopen = onopen;
-		this.onabort = onabort;
-	}
-
-	function onerror(event) {
-		var f = this.onabort;
-		if (f) {
-			delete this.onopen;
-			delete this.onabort;
-			f && f(this);
-		}
-		this.onerror && this.onerror(this);
-	}
-
-	function onopen(event) {
-		var f = this.onopen;
-		delete this.onopen;
-		delete this.onabort;
-		f && f(this);
-	}
-
-	function onclose(event) {
-		for (var id in this.pendings) {
-			var ferr = this.pendings[id].onerror;
-			ferr && ferr(null, this);
-		}
-		this.pendings = {};
-		this.onclose && this.onclose();
-	}
-
-	function onmessage(event) {
-		var obj = JSON.parse(event.data);
-		var code = obj[0];
-		var id = obj[1];
-		var ans = obj[2];
-		this.ctx.token = obj[3];
-		var pend;
-		if (id && id in this.pendings) {
-			pend = this.pendings[id];
-			delete this.pendings[id];
-		}
-		switch (code) {
-		case RETOK:
-			pend && pend.onsuccess && pend.onsuccess(ans, this);
-			break; 
-		case RETERR:
-		default:
-			pend && pend.onerror && pend.onerror(ans, this);
-			break; 
-		}
-	}
-
-	function close() {
-		this.ws.close();
-	}
-
-	function call(api, verb, request, onsuccess, onerror) {
-		var id = String(++this.counter);
-		this.pendings[id] = { onsuccess: onsuccess, onerror: onerror };
-		var arr = [CALL, id, api+"/"+verb, request ];
-		if (this.ctx.token) arr.push(this.ctx.token);
-		this.ws.send(JSON.stringify(arr));
-	}
-
-	AfbWsItf.prototype = {
-		close: close,
-		call: call
-	};
-
-	return AfbWsItf;
-})();
-
diff --git a/nbproject/configurations.xml b/nbproject/configurations.xml
index 370176d..2da26c2 100644
--- a/nbproject/configurations.xml
+++ b/nbproject/configurations.xml
@@ -2,6 +2,13 @@
 <configurationDescriptor version="100">
   <logicalFolder name="root" displayName="root" projectFiles="true" kind="ROOT">
     <df root="." name="0">
+      <df name="Alsa">
+        <df name="HardAbsLayer">
+          <df name="Includes">
+            <in>AlsaMixerHal.h</in>
+          </df>
+        </df>
+      </df>
       <df name="MostVolume">
         <df name="external">
           <in>ConnectionInfo.cpp</in>
@@ -57,6 +64,8 @@
           <preBuildFirst>true</preBuildFirst>
         </preBuild>
       </makefileType>
+      <item path="Alsa/Includes/AlsaMixerHal.h" ex="false" tool="3" flavor2="0">
+      </item>
       <item path="MostVolume/DeviceContainer.cpp" ex="false" tool="1" flavor2="0">
       </item>
       <item path="MostVolume/DeviceValue.cpp" ex="false" tool="1" flavor2="0">