Takashi Iwai
141a404e6c
- Backport alsa-utils fixes from upstream: 0001-alsamixer-fix-display-of-active-inactive-controls.patch 0002-alsaloop-libsamplerate-requires-specific-formats-for.patch 0003-alsaloop-another-try-to-force-correct-formats-for-li.patch 0004-alsamixer-fix-build-on-uClibc.patch 0005-alsactl-init-Mute-CD-Playback-volume-by-default.patch 0006-Revert-alsactl-Display-help-for-names-command.patch 0007-alsaucm-Add-list1-command-for-non-tuple-lists.patch 0008-alsaucm-Don-t-double-free-empty-lists.patch 0009-aplay-Add-i-option-for-interactive-mode.patch 0010-aplay-Avoid-recursive-signal-handling.patch 0012-alsaloop-Use-AM_CFLAGS-in-Makefile.am.patch 0013-Updated-COPYING-with-the-recent-FSF-address.patch 0014-alsamixer-Fix-64bit-issues.patch 0015-aplay-Add-include-files-for-mkdir.patch 0016-aplay-Use-standard-endian-convesions.patch OBS-URL: https://build.opensuse.org/request/show/72632 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa-utils?expand=0&rev=33
41 lines
1.1 KiB
Diff
41 lines
1.1 KiB
Diff
From cd26f244e7f2648a63411741552c658ca67334e9 Mon Sep 17 00:00:00 2001
|
|
From: Raymond Yau <superquad.vortex2@gmail.com>
|
|
Date: Mon, 28 Feb 2011 15:36:36 +0100
|
|
Subject: [PATCH 01/16] alsamixer: fix display of active/inactive controls
|
|
|
|
Signed-off-by: Raymond Yau <superquad.vortex2@gmail.com>
|
|
Signed-off-by: Clemens Ladisch <clemens@ladisch.de>
|
|
---
|
|
alsamixer/mixer_widget.c | 11 +++++++++++
|
|
1 files changed, 11 insertions(+), 0 deletions(-)
|
|
|
|
diff --git a/alsamixer/mixer_widget.c b/alsamixer/mixer_widget.c
|
|
index fb352d3..caaf777 100644
|
|
--- a/alsamixer/mixer_widget.c
|
|
+++ b/alsamixer/mixer_widget.c
|
|
@@ -59,10 +59,21 @@ enum channel_mask {
|
|
|
|
static int elem_callback(snd_mixer_elem_t *elem, unsigned int mask)
|
|
{
|
|
+ unsigned int i;
|
|
+
|
|
if (mask & (SND_CTL_EVENT_MASK_REMOVE |
|
|
SND_CTL_EVENT_MASK_INFO |
|
|
SND_CTL_EVENT_MASK_VALUE))
|
|
controls_changed = TRUE;
|
|
+
|
|
+ if (mask & SND_CTL_EVENT_MASK_INFO)
|
|
+ for (i = 0; i < controls_count; ++i)
|
|
+ if (controls[i].elem == elem) {
|
|
+ controls[i].flags &= ~IS_ACTIVE;
|
|
+ if (snd_mixer_selem_is_active(controls[i].elem))
|
|
+ controls[i].flags |= IS_ACTIVE;
|
|
+ }
|
|
+
|
|
return 0;
|
|
}
|
|
|
|
--
|
|
1.7.5.3
|
|
|