Hello community,
here is the log from the commit of package alsa for openSUSE:Factory checked in
at 2014-03-19 08:01:49
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/alsa (Old)
and /work/SRC/openSUSE:Factory/.alsa.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "alsa"
Changes:
--------
--- /work/SRC/openSUSE:Factory/alsa/alsa.changes 2014-03-16
08:04:58.000000000 +0100
+++ /work/SRC/openSUSE:Factory/.alsa.new/alsa.changes 2014-03-19
08:01:50.000000000 +0100
@@ -1,0 +2,6 @@
+Tue Mar 18 15:31:12 CET 2014 - ti...@suse.de
+
+- Fix the silent output with PulseAudio (bnc#868795)
+ 0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch
+
+-------------------------------------------------------------------
New:
----
0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ alsa.spec ++++++
--- /var/tmp/diff_new_pack.xOD7SE/_old 2014-03-19 08:01:51.000000000 +0100
+++ /var/tmp/diff_new_pack.xOD7SE/_new 2014-03-19 08:01:51.000000000 +0100
@@ -88,6 +88,7 @@
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 @@
%patch34 -p1
%patch35 -p1
%patch36 -p1
+%patch37 -p1
%if 0%{?suse_version} == 1130
%patch99 -p1
%endif
++++++ 0037-pcm-route-Don-t-handle-no-matching-chmap-as-a-seriou.patch ++++++
>From 5b72e3d5305930bffc300aa4f2545ba95992c144 Mon Sep 17 00:00:00 2001
From: Takashi Iwai <ti...@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 <ti...@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
--
To unsubscribe, e-mail: opensuse-commit+unsubscr...@opensuse.org
For additional commands, e-mail: opensuse-commit+h...@opensuse.org
