From 58f8bd31a49bd09f8d339e9cfab43c9db64905cb Mon Sep 17 00:00:00 2001
From: zhaohe <h_zhaohe@163.com>
Date: Sat, 4 Mar 2023 16:21:19 +0800
Subject: [PATCH] update asound.conf

---
 dep/zlinuxcomponents       |  2 +-
 env/rootfs/etc/asound.conf | 96 +++++++++++++++++++++++++++-------------------
 2 files changed, 58 insertions(+), 40 deletions(-)

diff --git a/dep/zlinuxcomponents b/dep/zlinuxcomponents
index 36bf5f4..b277524 160000
--- a/dep/zlinuxcomponents
+++ b/dep/zlinuxcomponents
@@ -1 +1 @@
-Subproject commit 36bf5f49f066b869d377d976b2d25b88d75ab053
+Subproject commit b277524c89278400e82d2dca7c551c0fe2658f6b
diff --git a/env/rootfs/etc/asound.conf b/env/rootfs/etc/asound.conf
index 61d8304..09833b3 100644
--- a/env/rootfs/etc/asound.conf
+++ b/env/rootfs/etc/asound.conf
@@ -1,7 +1,29 @@
+#
+#
+# 当前配置文件生效后会产生如下效果
+# 1. 通过amixer controls,可以看到如下音量控制器,其中通过Master Volume控制的是主音量,
+# default_playback用于在唤醒的时候降低背景声音。
+#   root@firefly:~# amixer controls
+#   numid=1,iface=MIXER,name='Master Volume'
+#   numid=2,iface=MIXER,name='Ch1 Volume'
+#   numid=3,iface=MIXER,name='Ch2 Volume'
+#   numid=4,iface=MIXER,name='default_playback'
+#   numid=5,iface=MIXER,name='wakeup_playback'
+#
+# 2. 通过aplay播放音频文件时，会自动通过default_playback设备播放，即其他应用程序例如chrome播放音频的时候也会自动使用这个设备
+# 3. 通过amixer控制音量时候，无需通过-c指定声卡编号
+# 4. 通过amixer通过default_playback控制音量来实现唤醒时降低背景声音。
+# 5. 通过amixer通过Master控制音量来实现对系统音量大小的控制。
+#
+
 pcm.!default {
     type plug
     slave.pcm "default_playback"
 }
+ctl.!default {
+  type hw
+  card 2
+}
 pcm.default_playback {
     type softvol
     slave {
@@ -9,27 +31,25 @@ pcm.default_playback {
     }
     control {
         name "default_playback"
-        card 1
+        card 2
     }
     min_dB -40.0
     max_dB 0.0
     resolution 100
 }
-
-pcm.bg_playback {
+pcm.wakeup_playback {
     type softvol
     slave {
         pcm "xa8326"
     }
     control {
-        name "bg_playback"
-        card 1
+        name "wakeup_playback"
+        card 2
     }
     min_dB -40.0
     max_dB 0.0
     resolution 100
 }
-
 # 放音设备
 pcm.xa8326 {
     type plug
@@ -51,49 +71,47 @@ pcm.xa8326 {
     }
 }
 
-# 录音设备
-pcm.__recorder {
-    type multi
-    slaves.xa8326.pcm "hw:2,0"
-    slaves.xa8326.channels 2
-    slaves.pdm.pcm "hw:1,0"
-    slaves.pdm.channels 8
+# 重采样
+pcm.recorder {
+    type plug
+    slave {
+        pcm {
+            type multi
+            slaves.xa8326.pcm "hw:2,0"
+            slaves.xa8326.channels 2
+            slaves.pdm.pcm "hw:1,0"
+            slaves.pdm.channels 8
 
-    bindings.0.slave pdm
-    bindings.0.channel 0
+            bindings.0.slave pdm
+            bindings.0.channel 0
 
-    bindings.1.slave pdm
-    bindings.1.channel 1
+            bindings.1.slave pdm
+            bindings.1.channel 1
 
-    bindings.2.slave pdm
-    bindings.2.channel 2
+            bindings.2.slave pdm
+            bindings.2.channel 2
 
-    bindings.3.slave pdm
-    bindings.3.channel 3
+            bindings.3.slave pdm
+            bindings.3.channel 3
 
-    bindings.4.slave pdm
-    bindings.4.channel 4
+            bindings.4.slave pdm
+            bindings.4.channel 4
     
-    bindings.5.slave pdm
-    bindings.5.channel 5
+            bindings.5.slave pdm
+            bindings.5.channel 5
 
-    bindings.6.slave pdm
-    bindings.6.channel 6
+            bindings.6.slave pdm
+            bindings.6.channel 6
 
-    bindings.7.slave pdm
-    bindings.7.channel 7
+            bindings.7.slave pdm
+            bindings.7.channel 7
 
-    bindings.8.slave xa8326
-    bindings.8.channel 0
+            bindings.8.slave xa8326
+            bindings.8.channel 0
 
-    bindings.9.slave xa8326
-    bindings.9.channel 1    
-}
-# 重采样
-pcm.recorder {
-    type plug
-    slave {
-        pcm "__recorder"
+            bindings.9.slave xa8326
+            bindings.9.channel 1    
+        }
         rate 48000
         format S16_LE
         channels 10