On 03/11/2014 08:06 AM, Tanu Kaskinen wrote: > On Tue, 2014-03-11 at 05:55 +0100, David Henningsson wrote: >> In some cases, "Analog Input" could show up as well as >> "Headset Mic" (or "Headphone Mic"), because I forgot to add the >> relevant "required-absent" lines when I added the headset mic path. >> >> As a result, both "Analog Input" and "Headset Mic" showed up on the >> Logitech USB 530 Headset. >> >> Reported-by: Steve Magoun <steve.magoun at canonical.com> >> Signed-off-by: David Henningsson <david.henningsson at canonical.com> >> --- >> src/modules/alsa/mixer/paths/analog-input.conf | 15 +++++++++++++++ >> 1 file changed, 15 insertions(+) >> >> diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf >> index c8f8e3c..356b07c 100644 >> --- a/src/modules/alsa/mixer/paths/analog-input.conf >> +++ b/src/modules/alsa/mixer/paths/analog-input.conf >> @@ -61,6 +61,21 @@ required-absent = any >> [Element Rear Mic Boost] >> required-absent = any >> >> +[Element Headset] >> +required-absent = any >> + >> +[Element Headset Mic] >> +required-absent = any >> + >> +[Element Headset Mic Boost] >> +required-absent = any >> + >> +[Element Headphone Mic] >> +required-absent = any >> + >> +[Element Headphone Mic Boost] >> +required-absent = any >> + >> [Element Line] >> required-absent = any > > Looks good to me. Thanks for the quick review, pushed now. > One question: why don't we suppress creation of analog-output in the > same way as analog-input? Good question. For some reason we rely on subset elimination on the output side instead for the same thing. I haven't really thought that through, but in recent years we have implemented "required-any" and added a "Line Out" path, so maybe that can now be changed? -- David Henningsson, Canonical Ltd. https://launchpad.net/~diwic
