various bug fix, add alsa configuration file to match with Hal control

4 files changed, 79 insertions, 41 deletions

diff --git a/conf.d/cmake/config.cmake b/conf.d/cmake/config.cmake
index ff824cf..5f84437 100644
--- a/conf.d/cmake/config.cmake
+++ b/conf.d/cmake/config.cmake
@@ -29,7 +29,6 @@ set(PROJECT_AUTHOR_MAIL "tvuong@audiokinetic.com")
 set(PROJECT_LICENCE "Apache-V2")
 set(PROJECT_LANGUAGES,"C")
 
-
 # Where are stored default templates files from submodule or subtree app-templates in your project tree
 # relative to the root project directory
 set(PROJECT_APP_TEMPLATES_DIR "conf.d/app-templates")
@@ -53,8 +52,7 @@ set(CONTROL_SUPPORT_LUA 1 CACHE BOOL "Active or not LUA Support")
 
 # PKG_CONFIG required packages
 # -----------------------------
-set (PKG_REQUIRED_LIST
-        glib-2.0
+set (PKG_REQUIRED_LIST    
 	alsa>=1.1.2
 	libsystemd>=222
 	libmicrohttpd>=0.9.55
diff --git a/conf.d/project/.asoundrc-audiok b/conf.d/project/.asoundrc
index cba88e5..8dde445 100644
--- a/conf.d/project/.asoundrc-audiok
+++ b/conf.d/project/.asoundrc
@@ -1,6 +1,6 @@
-
-
-##### AGL Conf #####
+#AGL Audio High Level ALSA configuration
+#This define 2 sounds card with 8 audio roles each
+#The alsa soft volume control name must match with the HAL Control Name
 pcm.SoftMixer { 
     type dmix 
     ipc_key 1024
@@ -10,9 +10,9 @@ pcm.SoftMixer {
     # Define target effective sound card (cannot be a plugin)
     slave { 
         pcm "hw:0"  # Main sound card
-        # periods 8 
-        period_size 1024 
+        channels 2
         buffer_size 4096
+        period_size 1024
     }
 
     # DMIX can only map two channels
@@ -30,10 +30,10 @@ pcm.SoftMixer_DriverHR {
 
     # Define target effective sound card (cannot be a plugin)
     slave { 
-        pcm "hw:1"  # Alternate sound card / dummy
-        # periods 8 
-        period_size 1024 
+        pcm "hw:3"  # Alternate sound card / dummy
+        channels 2
         buffer_size 4096
+        period_size 1024
     }
 
     # DMIX can only map two channels
@@ -51,10 +51,7 @@ pcm.SoftMixer_RSE {
 
     # Define target effective sound card (cannot be a plugin)
     slave { 
-        pcm "hw:2"  # Alternate sound card / dummy
-        # periods 8 
-        period_size 1024 
-        buffer_size 4096
+        pcm "hw:4"  # Alternate sound card / dummy
     }
 
     # DMIX can only map two channels
@@ -68,7 +65,7 @@ pcm.Entertainment_Main {
  type softvol
  slave.pcm "SoftMixer"
  control{
-   name "Entertainment_Vol"
+   name "Entertainment_Volume"
    card 0
  }
 }
@@ -77,7 +74,7 @@ pcm.Guidance_Main {
  type softvol
  slave.pcm "SoftMixer"
  control{
-   name "Guidance_Vol"
+   name "Guidance_Volume"
    card 0
  }
 }
@@ -86,7 +83,7 @@ pcm.Communications_Main {
  type softvol
  slave.pcm "SoftMixer"
  control{
-   name "Communications_Vol"
+   name "Communications_Volume"
    card 0
  }
 }
@@ -95,7 +92,7 @@ pcm.Notification_Main {
  type softvol
  slave.pcm "SoftMixer"
  control{
-   name "Notification_Vol"
+   name "Notification_Volume"
    card 0
  }
 }
@@ -104,7 +101,34 @@ pcm.Warning_Main {
  type softvol
  slave.pcm "SoftMixer"
  control{
-   name "Warning_Vol"
+   name "Warning_Volume"
+   card 0
+ }
+}
+
+pcm.System_Main {
+ type softvol
+ slave.pcm "SoftMixer"
+ control{
+   name "System_Volume"
+   card 0
+ }
+}
+
+pcm.Startup_Main {
+ type softvol
+ slave.pcm "SoftMixer"
+ control{
+   name "Startup_Volume"
+   card 0
+ }
+}
+
+pcm.Shutdown_Main {
+ type softvol
+ slave.pcm "SoftMixer"
+ control{
+   name "Shutdown_Volume"
    card 0
  }
 }
@@ -113,8 +137,8 @@ pcm.Entertainment_DriverHR {
  type softvol
  slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Entertainment_Vol"
-   card 1
+   name "Entertainment_Volume"
+   card 3
  }
 }
 
@@ -122,8 +146,8 @@ pcm.Guidance_DriverHR {
  type softvol
  slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Guidance_Vol"
-   card 1
+   name "Guidance_Volume"
+   card 3
  }
 }
 
@@ -131,8 +155,8 @@ pcm.Communications_DriverHR {
  type softvol
  slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Communications_Vol"
-   card 1
+   name "Communications_Volume"
+   card 3
  }
 }
 
@@ -140,8 +164,8 @@ pcm.Notification_DriverHR {
  type softvol
  slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Notification_Vol"
-   card 1
+   name "Notification_Volume"
+   card 3
  }
 }
 
@@ -149,16 +173,35 @@ pcm.Warning_DriverHR {
  type softvol
  slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Warning_Vol"
-   card 1
+   name "Warning_Volume"
+   card 3
  }
 }
 
-pcm.Entertainment_RSE {
+
+pcm.System_DriverHR {
  type softvol
- slave.pcm "SoftMixer_RSE"
+ slave.pcm "SoftMixer_DriverHR"
+ control{
+   name "System_Volume"
+   card 3
+ }
+}
+
+pcm.Startup_DriverHR {
+ type softvol
+ slave.pcm "SoftMixer_DriverHR"
+ control{
+   name "Startup_Volume"
+   card 3
+ }
+}
+
+pcm.Shutdown_DriverHR {
+ type softvol
+ slave.pcm "SoftMixer_DriverHR"
  control{
-   name "Entertainment_Vol"
-   card 2
+   name "Shutdown_Volume"
+   card 3
  }
 }
diff --git a/conf.d/project/ahl-audiok4a-config.json b/conf.d/project/ahl-aaaa-config.json
index 74ab251..5f24b00 100644
--- a/conf.d/project/ahl-audiok4a-config.json
+++ b/conf.d/project/ahl-aaaa-config.json
@@ -58,10 +58,10 @@
             "priority": 50,
             "output": [
                 "alsa.plug:Communications_Main",
-                "alsa.plug:Communications_DriverHR",
+                "alsa.plug:Communications_DriverHR"
             ],
             "input": [
-                "alsa.hw:0",
+                "alsa.hw:0"
             ],
             "actions": [
                 "bt_device_connected",
@@ -76,7 +76,7 @@
             "priority": 0,
             "output": [
                 "alsa.plug:Entertainment_Main",
-                "alsa.plug:Entertainment_DriverHR",
+                "alsa.plug:Entertainment_DriverHR"
             ],
             "interupt_behavior": "pause"
         },
diff --git a/conf.d/project/ahl-fulup4a-config.json b/conf.d/project/ahl-fulup4a-config.json
index 1a851a5..4f418e2 100644
--- a/conf.d/project/ahl-fulup4a-config.json
+++ b/conf.d/project/ahl-fulup4a-config.json
@@ -7,7 +7,6 @@
     "audio_roles": [
         {
             "name": "Guidance",
-            "id": 1,
             "description": "Important user information where user action is expected (e.g. navigation instruction)",
             "priority": 25,
             "output": [
@@ -16,8 +15,7 @@
             "interupt_behavior": "continue"
         },
         {
-            "name": "Emergency",
-            "id": 2,
+            "name": "Notification",
             "description": "HMI or else notifications (e.g. touchscreen events, speech recognition on/off,...)",
             "priority": 100,
             "output": [
@@ -27,7 +25,6 @@
         },
         {
             "name": "Entertainment",
-            "id": 3,
             "description": "Multimedia content (e.g. tuner, media player, etc.)",
             "priority": 0,
             "output": [