From: Jaroslav Kysela <perex@perex.cz>
Date: Wed, 24 Jun 2020 17:28:35 +0000 (+0200)
Subject: alsa.conf: load /etc/asound.conf or /usr/etc/asound.conf not both
X-Git-Tag: android-x86-8.1-r6~242
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=eb94bf02803797df0506357cb85bde3a4f65a0dc;p=android-x86%2Fexternal-alsa-lib.git

alsa.conf: load /etc/asound.conf or /usr/etc/asound.conf not both

Signed-off-by: Jaroslav Kysela <perex@perex.cz>
---

diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
index aea1fe24..a04173a0 100644
--- a/src/conf/alsa.conf
+++ b/src/conf/alsa.conf
@@ -9,9 +9,8 @@
 		func load
 		files [
 			"/usr/etc/alsa/conf.d"
-			"/usr/etc/asound.conf"
 			"/etc/alsa/conf.d"
-			"/etc/asound.conf"
+			"/etc/asound.conf|||/usr/etc/asound.conf"
 			"~/.asoundrc"
 			{
 				@func concat