Attachment 114250 Details for Bug 84983 – Quick workaround

[patch] Quick workaround

0001-alsa-mixer-Ignore-volume-with-unexpected-number-of-c.patch (text/plain), 2.13 KB, created by David Henningsson on 2015-03-12 09:46:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: David Henningsson

Created: 2015-03-12 09:46:35 UTC

Size: 2.13 KB

patch

obsolete

>From e9abd41f0c49b088301faca10bf1cddddde71595 Mon Sep 17 00:00:00 2001
>From: David Henningsson <david.henningsson@canonical.com>
>Date: Thu, 12 Mar 2015 10:40:44 +0100
>Subject: [PATCH] alsa-mixer: Ignore volume with unexpected number of channels
>
>We currently only support one and two channels for volumes, and
>bail out otherwise. This makes Xonar users unhappy because they
>have a volume with eight channels, and bailing out means they
>don't have a path/port at all.
>
>This way they will at least have a port, which will in turn make
>the gnome/unity UI behave better.
>
>BugLink: https://bugs.freedesktop.org/show_bug.cgi?id=84983
>BugLink: https://bugzilla.gnome.org/show_bug.cgi?id=745017
>Signed-off-by: David Henningsson <david.henningsson@canonical.com>
>---
> src/modules/alsa/alsa-mixer.c | 6 +++---
> 1 file changed, 3 insertions(+), 3 deletions(-)
>
>diff --git a/src/modules/alsa/alsa-mixer.c b/src/modules/alsa/alsa-mixer.c
>index 2fe2ae4..996f743 100644
>--- a/src/modules/alsa/alsa-mixer.c
>+++ b/src/modules/alsa/alsa-mixer.c
>@@ -1638,10 +1638,10 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
> 
>                     if (e->n_channels <= 0) {
>                         pa_log_warn("Volume element %s with no channels?", e->alsa_name);
>-                        return -1;
>+                        e->volume_use = PA_ALSA_VOLUME_IGNORE;
>                     }
> 
>-                    if (e->n_channels > 2) {
>+                    else if (e->n_channels > 2) {
>                         /* FIXME: In some places code like this is used:
>                          *
>                          *     e->masks[alsa_channel_ids[p]][e->n_channels-1]
>@@ -1654,7 +1654,7 @@ static int element_probe(pa_alsa_element *e, snd_mixer_t *m) {
>                          * don't support elements with more than two
>                          * channels... */
>                         pa_log_warn("Volume element %s has %u channels. That's too much! I can't handle that!", e->alsa_name, e->n_channels);
>-                        return -1;
>+                        e->volume_use = PA_ALSA_VOLUME_IGNORE;
>                     }
> 
>                     if (!e->override_map) {
>-- 
>1.9.1
>

Actions: View | Splinter Review

Attachments on bug 84983: 107819 | 107820 | 107892 | 108063 | 113764 | 113765 | 113811 | 113827 | 113855 | 114250

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.