|
 |
de7aed4 |
From 9641a4f5e8601350f67e89480e41aaf3a64b8799 Mon Sep 17 00:00:00 2001
|
|
|
de7aed4 |
From: Jaroslav Kysela <perex@perex.cz>
|
|
|
de7aed4 |
Date: Tue, 11 Feb 2020 10:54:16 +0100
|
|
|
de7aed4 |
Subject: [PATCH 1/5] alsa-ucm: correct the channel default logic (stereo)
|
|
|
de7aed4 |
|
|
|
de7aed4 |
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
|
de7aed4 |
---
|
|
|
de7aed4 |
src/modules/alsa/alsa-ucm.c | 13 ++++++++++---
|
|
|
de7aed4 |
1 file changed, 10 insertions(+), 3 deletions(-)
|
|
|
de7aed4 |
|
|
|
de7aed4 |
diff --git a/src/modules/alsa/alsa-ucm.c b/src/modules/alsa/alsa-ucm.c
|
|
|
de7aed4 |
index a57be6d22..b7d2c5b9c 100644
|
|
|
de7aed4 |
--- a/src/modules/alsa/alsa-ucm.c
|
|
|
de7aed4 |
+++ b/src/modules/alsa/alsa-ucm.c
|
|
|
de7aed4 |
@@ -377,6 +377,13 @@ static int ucm_get_device_property(
|
|
|
de7aed4 |
pa_log("UCM playback device %s fetch pcm failed", device_name);
|
|
|
de7aed4 |
}
|
|
|
de7aed4 |
|
|
|
de7aed4 |
+ if (pa_proplist_gets(device->proplist, PA_ALSA_PROP_UCM_SINK) &&
|
|
|
de7aed4 |
+ device->playback_channels == 0) {
|
|
|
de7aed4 |
+ pa_log("UCM file does not specify 'PlaybackChannels' "
|
|
|
de7aed4 |
+ "for device %s, assuming stereo duplex.", device_name);
|
|
|
de7aed4 |
+ device->playback_channels = 2;
|
|
|
de7aed4 |
+ }
|
|
|
de7aed4 |
+
|
|
|
de7aed4 |
value = pa_proplist_gets(device->proplist, PA_ALSA_PROP_UCM_CAPTURE_CHANNELS);
|
|
|
de7aed4 |
if (value) { /* input */
|
|
|
de7aed4 |
/* get channels */
|
|
|
de7aed4 |
@@ -391,10 +398,10 @@ static int ucm_get_device_property(
|
|
|
de7aed4 |
pa_log("UCM capture device %s fetch pcm failed", device_name);
|
|
|
de7aed4 |
}
|
|
|
de7aed4 |
|
|
|
de7aed4 |
- if (device->playback_channels == 0 && device->capture_channels == 0) {
|
|
|
de7aed4 |
- pa_log_warn("UCM file does not specify 'PlaybackChannels' or 'CaptureChannels'"
|
|
|
de7aed4 |
+ if (pa_proplist_gets(device->proplist, PA_ALSA_PROP_UCM_SOURCE) &&
|
|
|
de7aed4 |
+ device->capture_channels == 0) {
|
|
|
de7aed4 |
+ pa_log("UCM file does not specify 'CaptureChannels' "
|
|
|
de7aed4 |
"for device %s, assuming stereo duplex.", device_name);
|
|
|
de7aed4 |
- device->playback_channels = 2;
|
|
|
de7aed4 |
device->capture_channels = 2;
|
|
|
de7aed4 |
}
|
|
|
de7aed4 |
|
|
|
de7aed4 |
--
|
|
|
de7aed4 |
2.24.1
|
|
|
de7aed4 |
|