Dell-WD15-Dock: cleaups and corrections

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

diff --git a/ucm2/Dell-WD15-Dock/HiFi.conf b/ucm2/Dell-WD15-Dock/HiFi.conf
deleted file mode 100644 (file)
index 3b02f81..0000000
--- a/ucm2/Dell-WD15-Dock/HiFi.conf
+++ /dev/null
@@ -1,26 +0,0 @@
-SectionDevice."Headphones" {
-       Comment "Headphones"
-
-       Value {
-               PlaybackChannels "2"
-               PlaybackPCM "hw:${CardId},0"
-       }
-}
-
-SectionDevice."LineOut" {
-       Comment "Line Out"
-
-       Value {
-               PlaybackChannels "2"
-               PlaybackPCM "hw:${CardId},1"
-       }
-}
-
-SectionDevice."Mic" {
-       Comment "Microphone"
-
-       Value {
-               CaptureChannels "2"
-               CapturePCM "hw:${CardId},0"
-       }
-}

diff --git a/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
new file mode 100644 (file)
index 0000000..37b7e0d
--- /dev/null
+++ b/ucm2/USB-Audio/Dell-WD15-Dock-HiFi.conf
@@ -0,0 +1,29 @@
+SectionDevice."Headphones" {
+       Comment "Headphones"
+
+       Value {
+               PlaybackPriority 100
+               PlaybackChannels 2
+               PlaybackPCM "hw:${CardId}"
+       }
+}
+
+SectionDevice."Line" {
+       Comment "Line Out"
+
+       Value {
+               PlaybackPriority 200
+               PlaybackChannels 2
+               PlaybackPCM "hw:${CardId},1"
+       }
+}
+
+SectionDevice."Mic" {
+       Comment "Microphone"
+
+       Value {
+               CapturePriority 100
+               CaptureChannels 2
+               CapturePCM "hw:${CardId}"
+       }
+}

diff --git a/ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf b/ucm2/USB-Audio/Dell-WD15-Dock.conf
similarity index 75%
rename from ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf
rename to ucm2/USB-Audio/Dell-WD15-Dock.conf
index 7b96a54..1fbac9e 100644 (file)
--- a/ucm2/Dell-WD15-Dock/Dell-WD15-Dock.conf
+++ b/ucm2/USB-Audio/Dell-WD15-Dock.conf
@@ -1,6 +1,6 @@
 Syntax 2
 Comment "USB-audio on Dell WD15 docking station"
 SectionUseCase."HiFi" {
-       File "HiFi.conf"
+       File "Dell-WD15-Dock-HiFi.conf"
        Comment "Default"
 }