Takashi Iwai
e8e74453bd
- Backport upstream fixes: UCM updates, Broadwell UCM support, namehint fixes, fix faulty assert in PCM plugins, etc: 0001-ucm-document-some-standard-values.patch 0002-conf-ucm-broadwell-rt286-add-ucm-config.patch 0003-conf-ucm-Add-Makefile.am-for-broadwell-rt286-ucm-con.patch 0004-ucm-reformat-snd_use_case_get-doc.patch 0005-ucm-improve-jack-configuration-documentation.patch 0006-USB-audio-Sound-Blaster-HD-iec958-is-on-device-1.patch 0007-Sync-include-sound-asound.h-with-4.1-kernel.patch 0008-conf-ucm-broadwell-rt286-change-to-use-the-correct-j.patch 0009-namehint-Fix-invalid-list-access-in-snd_device_name_.patch 0010-namehint-Fix-the-listing-without-device-number.patch 0011-namehint-Fix-bad-free-with-invalid-iface-name.patch 0012-Allow-hint-for-ctl-hwdep-timer-and-seq.patch 0013-conf-Add-hint-descriptions-to-ctl-hwdep-seq-and-time.patch 0014-conf-ucm-broadwell-rt286-change-to-set-capture-volum.patch 0015-ucm-allow-multiple-devices-in-JackHWMute.patch 0016-pcm-Remove-assert-from-snd_pcm_hw_params_slave.patch OBS-URL: https://build.opensuse.org/request/show/308371 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=181
48 lines
2.3 KiB
Diff
48 lines
2.3 KiB
Diff
From b4222f3fdc13f18fa621d6c6ff2fa6ed52e25de3 Mon Sep 17 00:00:00 2001
|
|
From: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
|
|
Date: Mon, 4 May 2015 19:10:38 +0300
|
|
Subject: [PATCH 15/16] ucm: allow multiple devices in JackHWMute
|
|
|
|
One jack may mute multiple devices, so let's make JackHWMute a list of
|
|
device names instead of just a single device name.
|
|
|
|
Signed-off-by: Tanu Kaskinen <tanu.kaskinen@linux.intel.com>
|
|
Acked-by: Liam Girdwood <liam.r.girdwood@linux.intel.com>
|
|
Acked-by: Mark Brown <broonie@kernel.org>
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
include/use-case.h | 17 +++++++++--------
|
|
1 file changed, 9 insertions(+), 8 deletions(-)
|
|
|
|
diff --git a/include/use-case.h b/include/use-case.h
|
|
index e3308b17b105..c7789c03c4e8 100644
|
|
--- a/include/use-case.h
|
|
+++ b/include/use-case.h
|
|
@@ -311,14 +311,15 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
|
|
* applications are likely to support only one or the other.
|
|
*
|
|
* If **JackHWMute** is set, it indicates that when the jack is plugged
|
|
- * in, the hardware automatically mutes some other device. The
|
|
- * JackHWMute value is the name of the muted device. Note that
|
|
- * JackHWMute should be used only when the hardware enforces the
|
|
- * automatic muting. If the hardware doesn't enforce any muting, it may
|
|
- * still be tempting to set JackHWMute to trick upper software layers to
|
|
- * e.g. automatically mute speakers when headphones are plugged in, but
|
|
- * that's application policy configuration that doesn't belong to UCM
|
|
- * configuration files.
|
|
+ * in, the hardware automatically mutes some other device(s). The
|
|
+ * JackHWMute value is a space-separated list of device names (this
|
|
+ * isn't compatible with device names with spaces in them, so don't use
|
|
+ * such device names!). Note that JackHWMute should be used only when
|
|
+ * the hardware enforces the automatic muting. If the hardware doesn't
|
|
+ * enforce any muting, it may still be tempting to set JackHWMute to
|
|
+ * trick upper software layers to e.g. automatically mute speakers when
|
|
+ * headphones are plugged in, but that's application policy
|
|
+ * configuration that doesn't belong to UCM configuration files.
|
|
*/
|
|
int snd_use_case_get(snd_use_case_mgr_t *uc_mgr,
|
|
const char *identifier,
|
|
--
|
|
2.4.1
|
|
|