From: Jaroslav Kysela Date: Mon, 22 Nov 2021 08:46:30 +0000 (+0100) Subject: USB-Audio: move Gigabyte Aorus configs to separate directory X-Git-Tag: v1.2.6~32 X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=0dedc0fcee021dd4f64a89af4857ccb6b0968eb8;p=alsa-ucm-conf.git USB-Audio: move Gigabyte Aorus configs to separate directory Signed-off-by: Jaroslav Kysela --- 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 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 656b989..2895f9e 100644 --- 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 9f8d26c..209853f 100644 --- 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 index 0000000..d7656a8 --- /dev/null +++ b/ucm2/common/linked.conf @@ -0,0 +1,3 @@ +ValueDefaults { + Linked 1 +}