Hi! > From: Connor McAdams <conmanx360@xxxxxxxxx> > > commit 7079f785b50055a32b72eddcb7d9ba5688db24d0 upstream. > > Change the Input Source enumerated control's strings to make it play > nice with pulseaudio. > +++ b/sound/pci/hda/patch_ca0132.c > @@ -106,7 +106,7 @@ enum { > }; > > /* Strings for Input Source Enum Control */ > -static const char *const in_src_str[3] = {"Rear Mic", "Line", "Front Mic" }; > +static const char *const in_src_str[3] = { "Microphone", "Line In", "Front Microphone" }; > #define IN_SRC_NUM_OF_INPUTS 3 If pulseaudio expects the strings to be from small set, should we have defines for them? If pulseaudio can't understand short versions, do these need fixing, too? hda_auto_parser.c: "Internal Mic", "Dock Mic", "Mic", "Rear Mic", "Front Mic" hda_auto_parser.c: return "Headset Mic"; hda_auto_parser.c: return "Headphone Mic"; hda_auto_parser.c: return "Mic"; hda_auto_parser.c: return "Headphone Mic"; hda_jack.c: cfg, "Headphone Mic"); hda_jack.c: cfg, "Headphone Mic"); hda_proc.c: "Line In", "Aux", "Mic", "Telephony", Best regards, Pavel -- http://www.livejournal.com/~pavelmachek
Attachment:
signature.asc
Description: Digital signature