Takashi Iwai
ccef10ef6c
- Backport alsa-lib fixes from upstream: 0001-Fix-alsa-lib-to-regard-3D-control-Depth-as-Playback-.patch 0002-alsa-lib-add-LaCie-Firewire-Speakers-Griffin-FireWav.patch 0003-alsa-lib-ucm-allow-values-to-be-read-from-devices.patch 0004-UCM-comment-fixes-and-fix-myvalue-initialization-fix.patch 0005-UCM-Fix-empty-get_list-initialize-returned-pointer-t.patch 0006-Conf-Fix-channels-of-ICE1712-to-10-12.patch 0007-UCM-Fix-LGPL-licence-how-to-receive-part-referred-GP.patch 0008-configure-Fail-when-the-user-attempts-to-compile-sha.patch 0009-Mark-Heaphone-Center-LFE-control-of-emu10k1-conf-as-.patch 0010-Fix-typo-in-comment-in-surround71.conf.patch 0011-test-latency-print-error-message-when-2-periods-per-.patch 0012-EMU10K1.conf-Don-t-lock-hook-controls.patch 0013-HDA-Intel.conf-Fix-low-mic-volume-due-to-pulseaudio-.patch 0014-alsa-lib-fixed-coverity-reported-issues-under-FORWAR.patch 0015-Fix-compile-warnings.patch 0016-Fix-printf-for-size_t.patch 0018-UCM-fix-memory-leak-when-executing-cset-commands.patch 0019-Specficy-subdevice-0-for-front-surround-of-HDA-Intel.patch 0020-emu10k1.conf-Fix-no-sound-problem-when-using-SB-Live.patch 0021-ctlparse-Respect-softfloat-configure-option.patch 0022-UCM-Fix-typo-in-error-message.patch 0023-UCM-Fix-deadlock-following-failed-get-_verb.patch OBS-URL: https://build.opensuse.org/request/show/72599 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=80
73 lines
1.5 KiB
Diff
73 lines
1.5 KiB
Diff
From d3906a93072171e5b5f4000d4a228af4eb8fa253 Mon Sep 17 00:00:00 2001
|
|
From: David Henningsson <david.henningsson@canonical.com>
|
|
Date: Mon, 28 Mar 2011 10:19:16 +0200
|
|
Subject: [PATCH 06/23] Conf: Fix channels of ICE1712 to 10/12
|
|
|
|
The ICE1712 kernel driver accepts 10 playback channels and
|
|
12 recording channels only. Therefore fix this channel count
|
|
in alsa-lib.
|
|
|
|
BugLink: http://bugs.launchpad.net/bugs/178442
|
|
Signed-off-by: David Henningsson <david.henningsson@canonical.com>
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
src/conf/cards/ICE1712.conf | 28 ++++++++++++++++++++++------
|
|
1 files changed, 22 insertions(+), 6 deletions(-)
|
|
|
|
diff --git a/src/conf/cards/ICE1712.conf b/src/conf/cards/ICE1712.conf
|
|
index 01e50d2..f5b8add 100644
|
|
--- a/src/conf/cards/ICE1712.conf
|
|
+++ b/src/conf/cards/ICE1712.conf
|
|
@@ -32,12 +32,26 @@ ICE1712.pcm.front.0 {
|
|
@args.CARD {
|
|
type string
|
|
}
|
|
- type route
|
|
- ttable.0.0 1
|
|
- ttable.1.1 1
|
|
- slave.pcm {
|
|
- type hw
|
|
- card $CARD
|
|
+ type asym
|
|
+ playback.pcm {
|
|
+ type route
|
|
+ ttable.0.0 1
|
|
+ ttable.1.1 1
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ slave.channels 10
|
|
+ }
|
|
+ capture.pcm {
|
|
+ type route
|
|
+ ttable.0.0 1
|
|
+ ttable.1.1 1
|
|
+ slave.pcm {
|
|
+ type hw
|
|
+ card $CARD
|
|
+ }
|
|
+ slave.channels 12
|
|
}
|
|
}
|
|
|
|
@@ -57,6 +71,7 @@ ICE1712.pcm.surround40.0 {
|
|
type hw
|
|
card $CARD
|
|
}
|
|
+ slave.channels 10
|
|
}
|
|
|
|
<confdir:pcm/surround41.conf>
|
|
@@ -79,6 +94,7 @@ ICE1712.pcm.surround51.0 {
|
|
type hw
|
|
card $CARD
|
|
}
|
|
+ slave.channels 10
|
|
}
|
|
|
|
<confdir:pcm/iec958.conf>
|
|
--
|
|
1.7.5.3
|
|
|