VEYRON-I2S: corrections and fixes

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

diff --git a/ucm2/VEYRON-I2S/HiFi.conf b/ucm2/VEYRON-I2S/HiFi.conf
index 8d07c7337fd7c2efe22f0ab48bd757a0a1f8311f..bed87c54cbd9bb9c49bb45866b0f5aae900beb4d 100644 (file)
--- a/ucm2/VEYRON-I2S/HiFi.conf
+++ b/ucm2/VEYRON-I2S/HiFi.conf
@@ -45,25 +45,31 @@ SectionDevice."Speaker" {
        Comment "Speaker"
 
        Value {
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId}"
        }
+
        EnableSequence [
                cset "name='Speaker Switch' on"
        ]
+
        DisableSequence [
                cset "name='Speaker Switch' off"
        ]
 }
 
-SectionDevice."Internal Mic" {
-       Comment "Int Mic"
+SectionDevice."Mic" {
+       Comment "Internal Microphone"
 
        Value {
-               CapturePCM "hw:${CardId},0"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
        }
+
        EnableSequence [
                cset "name='Int Mic Switch' on"
        ]
+
        DisableSequence [
                cset "name='Int Mic Switch' off"
        ]
@@ -73,7 +79,8 @@ SectionDevice."Headphones" {
        Comment "Headphones"
 
        Value {
-               PlaybackPCM "hw:${CardId},0"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId}"
        }
 
        EnableSequence [
@@ -88,11 +95,12 @@ SectionDevice."Headphones" {
        ]
 }
 
-SectionDevice."Mic" {
-       Comment "Headset Mic"
+SectionDevice."Headset" {
+       Comment "Headset Microphone"
 
        Value {
-               CapturePCM "hw:${CardId},0"
+               CapturePriority 200
+               CapturePCM "hw:${CardId}"
        }
 
        EnableSequence [