USB-Audio: Move Topping DX3 Pro+ config to Common/Headphones

The configuration is too generic. We can expect that more
hardware will follow this configuration.

Link: https://github.com/alsa-project/alsa-ucm-conf/pull/362
Signed-off-by: Jaroslav Kysela <perex@perex.cz>

diff --git a/ucm2/USB-Audio/Topping/DX3ProPlus-HiFi.conf b/ucm2/USB-Audio/Common/HeadphonesOnly-HiFi.conf
similarity index 78%
rename from ucm2/USB-Audio/Topping/DX3ProPlus-HiFi.conf
rename to ucm2/USB-Audio/Common/HeadphonesOnly-HiFi.conf
index b9a75a1d8a97668b8e24be7140977784d7f09ccc..75e42c60a022de76dcbf412acf73031557617449 100644 (file)
--- a/ucm2/USB-Audio/Topping/DX3ProPlus-HiFi.conf
+++ b/ucm2/USB-Audio/Common/HeadphonesOnly-HiFi.conf
@@ -2,5 +2,6 @@ SectionDevice."Headphones" {
        Comment "Headphones"
        Value {
                PlaybackPCM "hw:${CardId},0"
+               PlaybackMixerElem "PCM"
        }
 }

diff --git a/ucm2/USB-Audio/Common/HeadphonesOnly.conf b/ucm2/USB-Audio/Common/HeadphonesOnly.conf
new file mode 100644 (file)
index 0000000..20bb8a6
--- /dev/null
+++ b/ucm2/USB-Audio/Common/HeadphonesOnly.conf
@@ -0,0 +1,6 @@
+Comment "${CardName}"
+
+SectionUseCase."HiFi" {
+       Comment "Default"
+       File "/USB-Audio/Common/HeadphonesOnly-HiFi.conf"
+}

diff --git a/ucm2/USB-Audio/Topping/DX3ProPlus.conf b/ucm2/USB-Audio/Topping/DX3ProPlus.conf
deleted file mode 100644 (file)
index 0328091..0000000
--- a/ucm2/USB-Audio/Topping/DX3ProPlus.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-Comment "DX3 Pro+"
-
-SectionUseCase."HiFi" {
-       Comment "Default"
-       File "/USB-Audio/Topping/DX3ProPlus-HiFi.conf"
-}

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 11c66803d7ff5320b1317c8c2a436b0ba7d05c2b..b433d15fb55b8217fc5d1ed4c2b95f0bdda14995 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -88,6 +88,17 @@ If.realtek-alc4080 {
        True.Define.ProfileName "Realtek/ALC4080"
 }
 
+If.hp_only {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB152a:8750"
+       }
+       True.Define {
+               ProfileName "Common/HeadphonesOnly.conf"
+       }
+}
+
 If.gigabyte-aorus-main {
        Condition {
                Type String
@@ -379,17 +390,6 @@ If.ssl2 {
        }
 }
 
-If.Pro {
-       Condition {
-               Type String
-               Haystack "${CardComponents}"
-               Needle "USB152a:8750"
-       }
-       True.Define {
-               ProfileName "Topping/DX3ProPlus"
-       }
-}
-
 If.mixremap {
        Condition {
                Type String