From 070ccac33d65c651c972dfab9c6148e43d8d5d8e Mon Sep 17 00:00:00 2001
From: fulup <fulup.arfoll@iot.bzh>
Date: Thu, 3 Aug 2017 12:00:41 +0200
Subject: Initial Working Version on Alsa Policy-Policy-Hook

---
 Shared-Interface/audio-interface.c | 37 +++++++++++++++++++++++++++++++++----
 Shared-Interface/audio-interface.h | 14 ++++++++++++--
 2 files changed, 45 insertions(+), 6 deletions(-)

(limited to 'Shared-Interface')

diff --git a/Shared-Interface/audio-interface.c b/Shared-Interface/audio-interface.c
index b4750ae..3386460 100644
--- a/Shared-Interface/audio-interface.c
+++ b/Shared-Interface/audio-interface.c
@@ -16,13 +16,42 @@
  * 
  */
 #define _GNU_SOURCE  // needed for vasprintf
+#include "audio-interface.h"
 
-#include <json-c/json.h>
-#include <semaphore.h>
-#include <string.h>
+PUBLIC const char *halCtlsLabels[] = {
+   
+    [Master_Playback_Volume] = "Master_Playback_Volume",
+    [Master_OnOff_Switch] = "Master_OnOff_Switch",
+    [Master_Playback_Ramp]= "Master_Playback_Ramp",
+    [PCM_Playback_Volume] = "PCM_Playback_Volume",
+    [PCM_Playback_Switch] = "PCM_Playback_Switch",
+    [Capture_Volume]      = "Capture_Volume",
 
-#include "audio-interface.h"
+    [Vol_Ramp_Set_Mode]  = "Volume_Ramp_Mode",        
+    [Vol_Ramp_Set_Delay] = "Volume_Ramp_Delay",        
+    [Vol_Ramp_Set_Down]  = "Volume_Ramp_Down",        
+    [Vol_Ramp_Set_Up]    = "Volume_Ramp_Up",        
+    [Vol_Ramp_Set_Slave] = "Volume_Ramp_Slave",        
+       
+    // Application Virtual Channels
+    [Multimedia_Playback_Volume] = "Multimedia_Playback_Volume",       
+    [Navigation_Playback_Volume] = "Navigation_Playback_Volume",
+    [Emergency_Playback_Volume]  = "Emergency_Playback_Volume",   
+
+    // Do not remove EndHalCrlTag 
+    [EndHalCrlTag] = NULL
+};
 
+PUBLIC const char *halVolRampModes[] = {
+   
+   [RAMP_VOL_NONE]      = "None",
+   [RAMP_VOL_NORMAL]    = "Normal",
+   [RAMP_VOL_SMOOTH]    = "Smooth",
+   [RAMP_VOL_EMERGENCY] = "Emergency",
+   
+   [EndHalVolMod] = NULL,
+   
+};
 
 PUBLIC void pingtest(struct afb_req request) {
     json_object *query = afb_req_json(request);
diff --git a/Shared-Interface/audio-interface.h b/Shared-Interface/audio-interface.h
index 453a9c4..7bf258a 100644
--- a/Shared-Interface/audio-interface.h
+++ b/Shared-Interface/audio-interface.h
@@ -35,6 +35,9 @@
 #endif
 #define STATIC static
 
+// Soft control have dynamically allocated numid
+#define CTL_AUTO -1
+
 typedef enum {
   QUERY_QUIET   =0,  
   QUERY_COMPACT =1,  
@@ -63,7 +66,6 @@ typedef enum {
     StartHalCrlTag=0,
 
     // volume RAMP
-    Vol_Ramp,        
     Vol_Ramp_Set_Mode,        
     Vol_Ramp_Set_Delay,        
     Vol_Ramp_Set_Down,        
@@ -77,9 +79,15 @@ typedef enum {
     PCM_Playback_Switch,
     Capture_Volume,
     Master_OnOff_Switch,
+            
+    // Application Virtual Channels
+    Multimedia_Playback_Volume,        
+    Navigation_Playback_Volume,   
+    Emergency_Playback_Volume,        
            
    EndHalCrlTag // used to compute number of ctls
-} halCtlsEnumT;
+} halCtlsTagT;
+
 
 typedef enum {
    RAMP_VOL_NONE      = 0,
@@ -92,6 +100,8 @@ typedef enum {
 } halRampEnumT;
 
 PUBLIC void pingtest(struct afb_req request);
+extern const char *halVolRampModes[];
+extern const char *halCtlsLabels[];
 
 #endif /* AUDIO_INTERF_H */
 
-- 
cgit 1.2.3-korg