[PATCH] ALSA: usb-audio: Fix control names for Plantronics/Poly Headsets

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]



Add a control name fixer for all headsets with VID 0x047F.

Signed-off-by: Terry Junge <linuxhid@xxxxxxxxxxxxxxxxxxxxxx>
Signed-off-by: Wade Wang <wade.wang@xxxxxx>
---
 sound/usb/mixer.c | 30 ++++++++++++++++++++++++++++++
 1 file changed, 30 insertions(+)

diff --git a/sound/usb/mixer.c b/sound/usb/mixer.c
index bd67027c7677..110d43ace4d8 100644
--- a/sound/usb/mixer.c
+++ b/sound/usb/mixer.c
@@ -1664,6 +1664,33 @@ static void check_no_speaker_on_headset(struct snd_kcontrol *kctl,
 	snd_ctl_rename(card, kctl, "Headphone");
 }
 
+static void fix_plt_control_name(struct snd_kcontrol *kctl)
+{
+	static const char * const names_to_remove[] = {
+		"Earphone",
+		"Microphone",
+		"Receive",
+		"Transmit",
+		NULL
+	};
+	const char * const *n2r;
+	char *dst, *src;
+	size_t len;
+
+	for (n2r = names_to_remove; *n2r; ++n2r) {
+		dst = strstr(kctl->id.name, *n2r);
+		if (dst != NULL) {
+			src = dst + strlen(*n2r);
+			len = strlen(src) + 1;
+			if ((char *)kctl->id.name != dst && *(dst - 1) == ' ')
+				--dst;
+			memmove(dst, src, len);
+		}
+	}
+	if (kctl->id.name[0] == '\0')
+		strscpy(kctl->id.name, "Headset", SNDRV_CTL_ELEM_ID_NAME_MAXLEN);
+}
+
 static const struct usb_feature_control_info *get_feature_control_info(int control)
 {
 	int i;
@@ -1780,6 +1807,9 @@ static void __build_feature_ctl(struct usb_mixer_interface *mixer,
 		if (!mapped_name)
 			check_no_speaker_on_headset(kctl, mixer->chip->card);
 
+		if (USB_ID_VENDOR(mixer->chip->usb_id) == 0x047f)
+			fix_plt_control_name(kctl);
+
 		/*
 		 * determine the stream direction:
 		 * if the connected output is USB stream, then it's likely a
-- 
2.43.0






[Index of Archives]     [Pulseaudio]     [Linux Audio Users]     [ALSA Devel]     [Fedora Desktop]     [Fedora SELinux]     [Big List of Linux Books]     [Yosemite News]     [KDE Users]

  Powered by Linux