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
88 lines
1.7 KiB
Diff
88 lines
1.7 KiB
Diff
From 434f2f021f00045abcf79c9048b808c5dccfc930 Mon Sep 17 00:00:00 2001
|
|
From: Takashi Iwai <tiwai@suse.de>
|
|
Date: Thu, 30 Apr 2015 15:02:04 +0200
|
|
Subject: [PATCH 13/16] conf: Add hint descriptions to ctl, hwdep, seq and
|
|
timer devices
|
|
|
|
Signed-off-by: Takashi Iwai <tiwai@suse.de>
|
|
---
|
|
src/conf/alsa.conf | 15 ++++++++++++++-
|
|
1 file changed, 14 insertions(+), 1 deletion(-)
|
|
|
|
diff --git a/src/conf/alsa.conf b/src/conf/alsa.conf
|
|
index 5c928e8afbcd..f22918fbbf83 100644
|
|
--- a/src/conf/alsa.conf
|
|
+++ b/src/conf/alsa.conf
|
|
@@ -345,6 +345,7 @@ ctl.sysdefault {
|
|
name defaults.ctl.card
|
|
}
|
|
}
|
|
+ hint.description "Default control device"
|
|
}
|
|
ctl.default ctl.sysdefault
|
|
|
|
@@ -366,6 +367,7 @@ ctl.hw {
|
|
}
|
|
type hw
|
|
card $CARD
|
|
+ hint.description "Direct control device"
|
|
}
|
|
|
|
ctl.shm {
|
|
@@ -408,6 +410,7 @@ rawmidi.default {
|
|
name defaults.rawmidi.device
|
|
}
|
|
}
|
|
+ hint.description "Default raw MIDI device"
|
|
}
|
|
|
|
rawmidi.hw {
|
|
@@ -469,6 +472,7 @@ rawmidi.virtual {
|
|
|
|
seq.default {
|
|
type hw
|
|
+ hint.description "Default sequencer device"
|
|
}
|
|
|
|
seq.hw {
|
|
@@ -502,6 +506,7 @@ hwdep.default {
|
|
name defaults.hwdep.device
|
|
}
|
|
}
|
|
+ hint.description "Default hardware dependent device"
|
|
}
|
|
|
|
hwdep.hw {
|
|
@@ -536,6 +541,10 @@ hwdep.hw {
|
|
type hw
|
|
card $CARD
|
|
device $DEV
|
|
+ hint {
|
|
+ description "Direct hardware dependent device"
|
|
+ device $DEV
|
|
+ }
|
|
}
|
|
|
|
#
|
|
@@ -572,7 +581,7 @@ timer.default {
|
|
@func refer
|
|
name defaults.timer.subdevice
|
|
}
|
|
- hint.description "Default direct hardware timer device"
|
|
+ hint.description "Default timer device"
|
|
}
|
|
|
|
timer.hw {
|
|
@@ -618,4 +627,8 @@ timer.hw {
|
|
card $CARD
|
|
device $DEV
|
|
subdevice $SUBDEV
|
|
+ hint {
|
|
+ description "Direct timer device"
|
|
+ device $DEV
|
|
+ }
|
|
}
|
|
--
|
|
2.4.1
|
|
|