Takashi Iwai
62cc03c4bc
- Update alsa-info.sh to match dmesg with snd_ - Run spec-cleaner - Add missing Loopback.conf manually - Upstream fixes: minor clean ups, 2.1 PCM channel config support, portability improvements, PCM float format conversion fix, fix for ioplug 32bit hwptr wrap, etc. 0020-minor-malloc-changes.patch 0021-alsa-lib-minor-typo-in-pcm-doc.patch 0022-control_hw-fix-potential-memory-leak.patch 0023-pcm-initialize-pcm_dmix-monotonic-field.patch 0024-pcm-initialize-monotonic-field-for-dshare-and-dsnoop.patch 0025-pcm-use-CLOCK_REALTIME-for-non-monotonic-ts.patch 0026-alsa-lib-heavy-pcm-atomics-cleanup.patch 0027-conf-Add-basic-infrastructure-for-2.1-surround-sound.patch 0028-conf-Add-surround-2.1-support-to-all-cards.patch 0029-Portability-fix-look-for-sys-endian.h-as-well-as-end.patch 0030-autotools-update-style.patch 0031-pcm-Insert-linear-to-float-conversion-when-rate-or-c.patch 0032-pcm-route-Allow-chmap-syntax-for-slave-channels-in-t.patch 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch OBS-URL: https://build.opensuse.org/request/show/225572 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=152
43 lines
1.3 KiB
Diff
43 lines
1.3 KiB
Diff
From 48f1b308cc66152eb6db66742dd0d08d888cda8d Mon Sep 17 00:00:00 2001
|
|
From: David Henningsson <david.henningsson@canonical.com>
|
|
Date: Fri, 28 Feb 2014 08:57:07 +0100
|
|
Subject: [PATCH] conf: Allow 2.1 surround to use different number of channels
|
|
|
|
This way, cards that support LFE on four channels (e g laptop with
|
|
internal subwoofer) can do that, and other cards on a six channel setup
|
|
can use that as well.
|
|
|
|
Well, note that there is still a reference to "pcm.surround51" left here.
|
|
In practice, for HDA Intel sound cards this does not matter as both
|
|
surround51 and surround40 reference the same definition.
|
|
(And that's the only card I currently know of that actually does
|
|
surround2.1 over four channels.)
|
|
|
|
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/pcm/surround21.conf | 7 +++----
|
|
1 file changed, 3 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/src/conf/pcm/surround21.conf b/src/conf/pcm/surround21.conf
|
|
index be29020f24c7..7f4676b3f714 100644
|
|
--- a/src/conf/pcm/surround21.conf
|
|
+++ b/src/conf/pcm/surround21.conf
|
|
@@ -51,10 +51,9 @@ pcm.!surround21 {
|
|
]
|
|
}
|
|
}
|
|
- slave.channels 6
|
|
- ttable.0.0 1
|
|
- ttable.1.1 1
|
|
- ttable.2.5 1
|
|
+ ttable.0.FL 1
|
|
+ ttable.1.FR 1
|
|
+ ttable.2.LFE 1
|
|
hint {
|
|
description "2.1 Surround output to Front and Subwoofer speakers"
|
|
device $DEV
|
|
--
|
|
1.9.0
|
|
|