Tanu Kaskinen pushed to branch master at PulseAudio / pulseaudio
Commits: 3efcb684 by Jaroslav Kysela at 2020-10-04T14:22:53+03:00 alsa: mixer - reorder the type field in path parser The items array is assigned later and the order of fields is important. Signed-off-by: Jaroslav Kysela <[email protected]> - - - - - a46bdced by Jaroslav Kysela at 2020-10-04T14:22:53+03:00 alsa: fix analog-input-microphone-headset device type From: Hui Wang <[email protected]> Signed-off-by: Jaroslav Kysela <[email protected]> - - - - - 1 changed file: - src/modules/alsa/alsa-mixer.c Changes: ===================================== src/modules/alsa/alsa-mixer.c ===================================== @@ -2712,7 +2712,7 @@ static int path_verify(pa_alsa_path *p) { { "analog-input-microphone-rear", N_("Rear Microphone"), PA_DEVICE_PORT_TYPE_MIC }, { "analog-input-microphone-dock", N_("Dock Microphone"), PA_DEVICE_PORT_TYPE_MIC }, { "analog-input-microphone-internal", N_("Internal Microphone"), PA_DEVICE_PORT_TYPE_MIC }, - { "analog-input-microphone-headset", N_("Headset Microphone"), PA_DEVICE_PORT_TYPE_MIC }, + { "analog-input-microphone-headset", N_("Headset Microphone"), PA_DEVICE_PORT_TYPE_HEADSET }, { "analog-input-linein", N_("Line In"), PA_DEVICE_PORT_TYPE_LINE }, { "analog-input-radio", N_("Radio"), PA_DEVICE_PORT_TYPE_RADIO }, { "analog-input-video", N_("Video"), PA_DEVICE_PORT_TYPE_VIDEO }, @@ -2781,8 +2781,8 @@ pa_alsa_path* pa_alsa_path_new(const char *paths_dir, const char *fname, pa_alsa { "priority", pa_config_parse_unsigned, NULL, "General" }, { "description-key", pa_config_parse_string, NULL, "General" }, { "description", pa_config_parse_string, NULL, "General" }, - { "type", parse_type, NULL, "General" }, { "mute-during-activation", pa_config_parse_bool, NULL, "General" }, + { "type", parse_type, NULL, "General" }, { "eld-device", parse_eld_device, NULL, "General" }, /* [Option ...] */ View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/36a86d4149deed2c9a443b4eda3334632fbf7889...a46bdcedc140327b175aa7894e651489420f57b1 -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/36a86d4149deed2c9a443b4eda3334632fbf7889...a46bdcedc140327b175aa7894e651489420f57b1 You're receiving this email because of your account on gitlab.freedesktop.org.
_______________________________________________ pulseaudio-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/pulseaudio-commits
