From 521281617cec5d89725c4844eac68b5a772fab57 Mon Sep 17 00:00:00 2001
From: Fulup Ar Foll <fulup@iot.bzh>
Date: Sat, 11 Mar 2017 00:27:30 +0100
Subject: Work in Progress Static/Dynamic Lib Fixed. Source Tree cleaned up
 Compile but to be tested Business Logic not done

---
 AlsaSound/CoreBinding/AlsaAfbBinding.c |  7 +------
 AlsaSound/CoreBinding/AlsaLibMapping.c |  1 -
 AlsaSound/CoreBinding/AlsaLibMapping.h | 19 +------------------
 3 files changed, 2 insertions(+), 25 deletions(-)

(limited to 'AlsaSound/CoreBinding')

diff --git a/AlsaSound/CoreBinding/AlsaAfbBinding.c b/AlsaSound/CoreBinding/AlsaAfbBinding.c
index 4ae7ccc..a4433e8 100644
--- a/AlsaSound/CoreBinding/AlsaAfbBinding.c
+++ b/AlsaSound/CoreBinding/AlsaAfbBinding.c
@@ -30,17 +30,12 @@
 
 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= "ping"   ,   .session= AFB_SESSION_NONE, .callback= pingtest,      .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" },
diff --git a/AlsaSound/CoreBinding/AlsaLibMapping.c b/AlsaSound/CoreBinding/AlsaLibMapping.c
index 900aa3d..58f52c2 100644
--- a/AlsaSound/CoreBinding/AlsaLibMapping.c
+++ b/AlsaSound/CoreBinding/AlsaLibMapping.c
@@ -27,7 +27,6 @@
 
 #include <alsa/asoundlib.h>
 #include "AlsaLibMapping.h"
-
 #include <systemd/sd-event.h>
 static struct afb_service srvitf;
 
diff --git a/AlsaSound/CoreBinding/AlsaLibMapping.h b/AlsaSound/CoreBinding/AlsaLibMapping.h
index e9e3a42..fb1d39a 100644
--- a/AlsaSound/CoreBinding/AlsaLibMapping.h
+++ b/AlsaSound/CoreBinding/AlsaLibMapping.h
@@ -15,28 +15,11 @@
  * 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 ALSALIBMAPPING_H
 #define ALSALIBMAPPING_H
 
-#include <json-c/json.h>
-#include <afb/afb-binding.h>
-#include <afb/afb-service-itf.h>
-
-#include "MiscHelpers.h"
+#include "AudioCommonLib.h"
 
 // import from AlsaAfbBinding
 extern const struct afb_binding_interface *afbIface;
-- 
cgit 1.2.3-korg