USB-Audio: move Gigabyte Aorus configs to separate directory

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

diff --git a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Front-Headphone.conf b/ucm2/USB-Audio/Gigabyte-Aorus-Master-Front-Headphone.conf
deleted file mode 120000 (symlink)
index 1376437..0000000
--- a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Front-Headphone.conf
+++ /dev/null
@@ -1 +0,0 @@
-../module/lib/linked.conf
\ No newline at end of file

diff --git a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf b/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf
similarity index 100%
rename from ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio-HiFi.conf
rename to ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio-HiFi.conf

diff --git a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio.conf b/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
similarity index 62%
rename from ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio.conf
rename to ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
index 656b989762e6b33f9c7d5e13b6be14fb09757b36..2895f9e47b0aaca6d4fd5c8dc31fce1883719c4f 100644 (file)
--- a/ucm2/USB-Audio/Gigabyte-Aorus-Master-Main-Audio.conf
+++ b/ucm2/USB-Audio/Gigabyte/Aorus-Master-Main-Audio.conf
@@ -1,6 +1,5 @@
-Syntax 3
 Comment "Gigabyte Aorus Integrated Audio"
 SectionUseCase."HiFi" {
-       File "Gigabyte-Aorus-Master-Main-Audio-HiFi.conf"
+       File "Gigabyte/Aorus-Master-Main-Audio-HiFi.conf"
        Comment "Default Alsa Profile"
 }

diff --git a/ucm2/USB-Audio/USB-Audio.conf b/ucm2/USB-Audio/USB-Audio.conf
index 9f8d26ccdb85a8cf7973ba17f9bb4686ee7648d0..209853fc6e2b0dc66e9b8ba5e6937fd972ea1e43 100644 (file)
--- a/ucm2/USB-Audio/USB-Audio.conf
+++ b/ucm2/USB-Audio/USB-Audio.conf
@@ -2,6 +2,25 @@ Syntax 4
 
 Define.ProfileName ""
 
+If.linked {
+       Condition {
+               Type RegexMatch
+               String "${CardComponents}"
+               # Aorus Master Front Headphone 0414:a000
+               Regex "USB0414:a000"
+       }
+       True.Define.ProfileName "../common/linked"
+}
+
+If.gigabyte-aorus-main {
+       Condition {
+               Type String
+               Haystack "${CardComponents}"
+               Needle "USB0414:a001"
+       }
+       True.Define.ProfileName "Gigabyte/Aorus-Master-Main-Audio"
+}
+
 If.dell-wd15 {
        Condition {
                Type RegexMatch

diff --git a/ucm2/common/linked.conf b/ucm2/common/linked.conf
new file mode 100644 (file)
index 0000000..d7656a8
--- /dev/null
+++ b/ucm2/common/linked.conf
@@ -0,0 +1,3 @@
+ValueDefaults {
+       Linked 1
+}