Takashi Iwai
1848bd6c60
- Upstream fixes, including the alsa-tools build breakage: 0001-ucm-Use-strncmp-to-avoid-access-out-of-boundary.patch 0002-ucm-return-always-at-least-NULL-if-no-list-is-availa.patch 0003-ucm-add-_identifiers-list.patch 0004-namehint-correct-the-args-check.patch 0005-namehint-improve-the-previous-patch-check-the-return.patch 0006-ucm-docs-allow-spaces-in-device-names-for-JackHWMute.patch 0007-use-case-docs-add-PlaybackMixerCopy-and-CaptureMixer.patch 0008-ucm-docs-add-JackCTL-rearrange-JackControl-and-JackD.patch 0009-ucm-Do-not-fail-to-parse-configs-on-cards-with-an-em.patch 0010-src-ucm-main.c-fix-build-without-mixer.patch 0011-alsa.m4-another-try-to-fix-the-libatopology-detectio.patch 0012-ucm-docs-add-Mic-DigitalMic-and-multiple-devices-com.patch 0013-ucm-docs-remove-DigitalMic-it-does-not-have-sense.patch 0014-ucm-docs-change-the-Mic-description-to-simple-Microp.patch 0015-ucm-docs-add-note-about-the-sequences-and-device-spl.patch 0016-ucm-docs-remove-MixerCopy-values-add-Priority-for-ve.patch 0017-ucm-setup-conf_format-after-getting-ALSA_CONFIG_UCM_.patch 0018-alsa-lib-fix-the-array-parser-unique-compound-keys.patch 0019-topology-remove-vendor_fd-name-from-snd_tplg-structu.patch 0020-topology-file-position-and-size-cleanups.patch 0021-topology-use-an-array-describing-blocks-for-the-main.patch 0022-topology-use-size_t-for-calc_block_size.patch 0023-topology-merge-write_block-to-tplg_write_data.patch 0024-topology-make-vebose-output-more-nice.patch 0025-topology-use-list_insert-macro-in-tplg_elem_insert.patch 0026-topology-dapm-coding-fixes.patch 0027-topology-dapm-merge-identical-index-blocks-like-for-.patch 0028-topology-more-coding-fixes.patch 0029-Fix-alsa-sound-.h-for-external-programs.patch OBS-URL: https://build.opensuse.org/request/show/758564 OBS-URL: https://build.opensuse.org/package/show/multimedia:libs/alsa?expand=0&rev=263
57 lines
3.0 KiB
Diff
57 lines
3.0 KiB
Diff
From 4dddcf733d56a13f4d042fefa1fb6230c09f1f65 Mon Sep 17 00:00:00 2001
|
|
From: Jaroslav Kysela <perex@perex.cz>
|
|
Date: Mon, 2 Dec 2019 11:56:30 +0100
|
|
Subject: [PATCH 06/30] ucm: docs - allow spaces in device names for JackHWMute
|
|
|
|
Signed-off-by: Jaroslav Kysela <perex@perex.cz>
|
|
---
|
|
include/use-case.h | 25 +++++++++++++------------
|
|
1 file changed, 13 insertions(+), 12 deletions(-)
|
|
|
|
diff --git a/include/use-case.h b/include/use-case.h
|
|
index 85c58ac0614a..e1f5802789ff 100644
|
|
--- a/include/use-case.h
|
|
+++ b/include/use-case.h
|
|
@@ -326,7 +326,7 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
|
|
* - Valid values: "soft" (software attenuation)
|
|
* - EDIDFile
|
|
* - Path to EDID file for HDMI devices
|
|
- * - JackControl, JackDev, JackHWMute
|
|
+ * - JackControl, JackDev
|
|
* - Jack information for a device. The jack status can be reported via
|
|
* a kcontrol and/or via an input device. **JackControl** is the
|
|
* kcontrol name of the jack, and **JackDev** is the input device id of
|
|
@@ -334,17 +334,18 @@ int snd_use_case_get_list(snd_use_case_mgr_t *uc_mgr,
|
|
* JackDev value should be "foo"). UCM configuration files should
|
|
* contain both JackControl and JackDev when possible, because
|
|
* 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(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.
|
|
+ * - JackHWMute
|
|
+ * If this value is set, it indicates that when the jack is plugged
|
|
+ * in, the hardware automatically mutes some other device(s). The
|
|
+ * value is a space-separated list of device names. If the device
|
|
+ * name contains space, it must be enclosed to ' or ", e.g.:
|
|
+ * JackHWMute "'Dock Headphone' Headphone"
|
|
+ * 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.
|
|
* - MinBufferLevel
|
|
* - This is used on platform where reported buffer level is not accurate.
|
|
* E.g. "512", which holds 512 samples in device buffer. Note: this will
|
|
--
|
|
2.16.4
|
|
|