bytcht-es8316: cleanups and corrections

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

diff --git a/ucm2/codecs/es8316/HeadPhones.conf b/ucm2/codecs/es8316/HeadPhones.conf
index 3f3e591d3a93cfd2bf7d0ba62faa2eaceda10d11..603b40c2e6c157384391d8eddff65932dd4bfa8c 100644 (file)
--- a/ucm2/codecs/es8316/HeadPhones.conf
+++ b/ucm2/codecs/es8316/HeadPhones.conf
@@ -3,7 +3,6 @@ SectionDevice."Headphones" {
 
        ConflictingDevice [
                "Speaker"
-               "MonoSpeaker"
        ]
 
        EnableSequence [
@@ -15,8 +14,10 @@ SectionDevice."Headphones" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 200
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackChannels 2
                JackControl "Headphone Jack"
-               JackHWMute "Speaker MonoSpeaker"
+               JackHWMute "Speaker"
        }
 }

diff --git a/ucm2/codecs/es8316/IN1-HeadsetMic.conf b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
index 997a50bac5bf37f159dea8aaa7a4f39c6fb9b972..d798270dd4445994c71acd692ff21f97bdb1e85a 100644 (file)
--- a/ucm2/codecs/es8316/IN1-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN1-HeadsetMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."HeadsetMic-IN1" {
+SectionDevice."Headset" {
        Comment "Headset Microphone on IN1"
 
        ConflictingDevice [
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "HeadsetMic-IN2"
+               "Mic"
        ]
 
        EnableSequence [
@@ -17,7 +15,9 @@ SectionDevice."HeadsetMic-IN1" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 200
+               CapturePCM "hw:${CardId},0"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN1-InternalMic.conf b/ucm2/codecs/es8316/IN1-InternalMic.conf
index 70a77b9287d047dc710aea650eb72e7e3e24ef75..31c5cda6a314416c1e68cb867edab0dbbd7e30fa 100644 (file)
--- a/ucm2/codecs/es8316/IN1-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN1-InternalMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."InternalMic-IN1" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN1"
 
        ConflictingDevice [
-               "InternalMic-IN2"
-               "HeadsetMic-IN1"
-               "HeadsetMic-IN2"
+               "Headset"
        ]
 
        EnableSequence [
@@ -17,6 +15,8 @@ SectionDevice."InternalMic-IN1" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId}"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-HeadsetMic.conf b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
index 1ab122110796b9c414ff6d98332bef5a38c32224..28f26f8d4c4d762ec8635997582795690aacd81e 100644 (file)
--- a/ucm2/codecs/es8316/IN2-HeadsetMic.conf
+++ b/ucm2/codecs/es8316/IN2-HeadsetMic.conf
@@ -1,10 +1,8 @@
-SectionDevice."HeadsetMic-IN2" {
+SectionDevice."Headset" {
        Comment "Headset Microphone on IN2"
 
        ConflictingDevice [
-               "InternalMic-IN1"
-               "InternalMic-IN2"
-               "HeadsetMic-IN1"
+               "Mic"
        ]
 
        EnableSequence [
@@ -17,7 +15,9 @@ SectionDevice."HeadsetMic-IN2" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 200
+               CapturePCM "hw:${CardId},0"
+               CaptureChannels 2
                JackControl "Headset Mic Jack"
        }
 }

diff --git a/ucm2/codecs/es8316/IN2-InternalMic.conf b/ucm2/codecs/es8316/IN2-InternalMic.conf
index 7809f8a4775a75e7e94a133bb74aff3f8348a43b..8c0418fde5baeca98e6f6b3350ffb9af24b42ae6 100644 (file)
--- a/ucm2/codecs/es8316/IN2-InternalMic.conf
+++ b/ucm2/codecs/es8316/IN2-InternalMic.conf
@@ -1,4 +1,4 @@
-SectionDevice."InternalMic-IN2" {
+SectionDevice."Mic" {
        Comment "Internal Microphone on IN2"
 
        ConflictingDevice [
@@ -17,6 +17,8 @@ SectionDevice."InternalMic-IN2" {
        ]
 
        Value {
-               CaptureChannels "2"
+               CapturePriority 100
+               CapturePCM "hw:${CardId},0"
+               CaptureChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/MonoSpeaker.conf b/ucm2/codecs/es8316/MonoSpeaker.conf
index 704556a8f9c842353a0ce0453f88d6dc24301a4c..f11f2b7f2d417eba7e976e25ba047a5f2c80a208 100644 (file)
--- a/ucm2/codecs/es8316/MonoSpeaker.conf
+++ b/ucm2/codecs/es8316/MonoSpeaker.conf
@@ -1,8 +1,7 @@
-SectionDevice."MonoSpeaker" {
+SectionDevice."Speaker" {
        Comment "Mono Speaker"
 
        ConflictingDevice [
-               "Speaker"
                "Headphones"
        ]
 
@@ -32,6 +31,8 @@ SectionDevice."MonoSpeaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackChannels 2
        }
 }

diff --git a/ucm2/codecs/es8316/Speaker.conf b/ucm2/codecs/es8316/Speaker.conf
index 0e77746fd4742e84509be6dddeac7bfc5bd3ea55..a1e4491a85774f9f933701d41ae9ed0719b9ac3b 100644 (file)
--- a/ucm2/codecs/es8316/Speaker.conf
+++ b/ucm2/codecs/es8316/Speaker.conf
@@ -15,6 +15,8 @@ SectionDevice."Speaker" {
        ]
 
        Value {
-               PlaybackChannels "2"
+               PlaybackPriority 100
+               PlaybackPCM "hw:${CardId},0"
+               PlaybackChannels 2
        }
 }