pool/alsa
SHA256
4
0
Fork 1
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Accepting request 226606 from home:tiwai:branches:multimedia:libs

Browse Source 
- Fix the silent output with PulseAudio (bnc#868795)
  0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch

OBS-URL: https://build.opensuse.org/request/show/226606
OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=154
This commit is contained in:
Takashi Iwai 2014-03-18 14:35:50 +00:00 committed by Git OBS Bridge
parent 62cc03c4bc
commit 1918dac3d2
3 changed files with 43 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch Normal file
View File

@ -0,0 +1,35 @@
From 5b72e3d5305930bffc300aa4f2545ba95992c144 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <tiwai@suse.de>
Date: Tue, 18 Mar 2014 15:23:09 +0100
Subject: [PATCH] pcm: route: Don't handle no matching chmap as a serious error
When find_matching_chmap() returns an error for the non-matching
chmap, the caller, snd_pcm_route_open(), also returns an error
although it shouldn't be handled as the fatal error. This results in
the probe error with PulseAudio and it gives no real output in the
end.
Signed-off-by: Takashi Iwai <tiwai@suse.de>
---
src/pcm/pcm_route.c | 4 +---
1 file changed, 1 insertion(+), 3 deletions(-)
diff --git a/src/pcm/pcm_route.c b/src/pcm/pcm_route.c
index ab17fa78be2c..ac11bdc8adfd 100644
--- a/src/pcm/pcm_route.c
+++ b/src/pcm/pcm_route.c
@@ -940,10 +940,8 @@ static int find_matching_chmap(snd_pcm_t *spcm, snd_pcm_chmap_t *tt_chmap,
snd_pcm_free_chmaps(chmaps);
- if (*found_chmap == NULL) {
+ if (*found_chmap == NULL)
SNDERR("Found no matching channel map");
- return -EINVAL;
- }
return 0;
}
--
1.9.0

6
alsa.changes
View File

@ -1,3 +1,9 @@
-------------------------------------------------------------------
Tue Mar 18 15:31:12 CET 2014 - tiwai@suse.de
- Fix the silent output with PulseAudio (bnc#868795)
0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch
-------------------------------------------------------------------
Tue Mar 11 10:47:01 CET 2014 - tiwai@suse.de

2
alsa.spec
View File

@ -88,6 +88,7 @@ Patch33: 0033-pcm-route-Select-slave-chmap-based-on-ttable-informa.patch
Patch34: 0034-conf-Allow-2.1-surround-to-use-different-number-of-c.patch
Patch35: 0035-pcm-Wrap-hw_ptr-to-boundary-in-pcm_ioplug.patch
Patch36: 0036-src-conf-cards-Add-missing-entry-for-Loopback.conf.patch
Patch37: 0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch
# rest suse patches
Patch99: alsa-lib-doxygen-avoid-crash-for-11.3.diff
BuildRequires: doxygen
@ -193,6 +194,7 @@ cp %{SOURCE50} src/conf/cards
%patch34 -p1
%patch35 -p1
%patch36 -p1
%patch37 -p1
%if 0%{?suse_version} == 1130
%patch99 -p1
%endif