summaryrefslogtreecommitdiffstats
path: root/include/sound/control.h
diff options
context:
space:
mode:
authorJie Yang <yang.jie@intel.com>2015-04-27 15:20:57 +0200
committerTakashi Iwai <tiwai@suse.de>2015-04-27 21:37:41 +0200
commitb8dd086674cfbfc246a5b9d7d7ff37f62350a878 (patch)
tree035c115047a4c0fbbf99a352f7f66331e6a53815 /include/sound/control.h
parentALSA: jack: implement kctl creating for jack devices (diff)
downloadlinux-b8dd086674cfbfc246a5b9d7d7ff37f62350a878.tar.xz
linux-b8dd086674cfbfc246a5b9d7d7ff37f62350a878.zip
ALSA: Jack: handle jack embedded kcontrol creating within ctljack
This patch adds a static method get_available_index() to allocate the index of new jack kcontrols and also adds jack_kctl_name_gen() which is used to ensure compatibility with jack naming by removing " Jack" from some incorrectly passed names. Signed-off-by: Jie Yang <yang.jie@intel.com> Signed-off-by: Takashi Iwai <tiwai@suse.de>
Diffstat (limited to 'include/sound/control.h')
-rw-r--r--include/sound/control.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/control.h b/include/sound/control.h
index 95aad6d3fd1a..f50e2e918ceb 100644
--- a/include/sound/control.h
+++ b/include/sound/control.h
@@ -252,7 +252,7 @@ void snd_ctl_sync_vmaster(struct snd_kcontrol *kctl, bool hook_only);
* Helper functions for jack-detection controls
*/
struct snd_kcontrol *
-snd_kctl_jack_new(const char *name, int idx, void *private_data);
+snd_kctl_jack_new(const char *name, void *private_data, struct snd_card *card);
void snd_kctl_jack_report(struct snd_card *card,
struct snd_kcontrol *kctl, bool status);