Arun Raghavan pushed to branch marge_bot_batch_merge_job at PulseAudio / pulseaudio
Commits: 836ba89c by Mattias Jernberg at 2020-12-10T16:54:59+00:00 alsa-mixer: Enable volume control of SteelSeries Arctis stereo output Since there is now support for specifying the index of an Element, add the same config as is used for the output-mono variant, as they behave the same: One volume control with no support for adjustments to the left and right channels. Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/274> - - - - - 19e34d8d by Hui Wang at 2020-12-10T17:01:19+00:00 alsa-mixer: disable the Auto-Mute once the system has speaker With the Auto-Mute enabled, if the headphone jack is plugged, the alsa hda driver will mute the speaker and set pinctl of the speaker to Hi-Z state, after this happens, even the pulseaudio unmute the speaker, the speaker still couldn't output sound because the pinctl is in Hi-Z state. We found this issue on a Dell machine which has multi-function audio jack, after the headphone is plugged in, the speaker's availability is still unknown, users could select speaker from gnome-sound-setting, but even the speaker is selected to be the active device, it couldn't output sound. The Auto-Mute is not useful if the pulseaudio is running since pa could mute/unmute devices according to active port change, the ucm for sof+hda already disabled the Auto-Mute, let us disable it for hda audio if the machine has the internal speaker. Signed-off-by: Hui Wang <[email protected]> Part-of: <https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/merge_requests/433> - - - - - 2 changed files: - src/modules/alsa/mixer/paths/analog-output-speaker.conf - src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf Changes: ===================================== src/modules/alsa/mixer/paths/analog-output-speaker.conf ===================================== @@ -88,6 +88,13 @@ override-map.2 = all-left,all-right switch = off volume = off +; Make sure the internal speakers are not auto-muted once the system has speakers +[Element Auto-Mute Mode] +enumeration = select + +[Option Auto-Mute Mode:Disabled] +name = analog-output-speaker + ; This profile path is intended to control the speaker, let's mute headphones ; else there will be a spike when plugging in headphones [Element Headphone] ===================================== src/modules/alsa/mixer/paths/usb-gaming-headset-output-stereo.conf ===================================== @@ -23,10 +23,12 @@ ; Steelseries Arctis 7 ; Steelseries Arctis Pro Wireless. ; Lucidsound LS31 -; -; This path doesn't provide hardware volume control, because the stereo -; output is controlled by the PCM element with index 1, and currently -; PulseAudio only supports elements with index 0. [General] description-key = analog-output-headphones + +[Element PCM,1] +volume = merge +switch = mute +override-map.1 = all +override-map.2 = all-left,all-right View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/22cd65efc81cf9c4a20d6ed153b38fdcaf6af9e8...19e34d8d5bb9380ed70607b3f661c26df6d4836c -- View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/compare/22cd65efc81cf9c4a20d6ed153b38fdcaf6af9e8...19e34d8d5bb9380ed70607b3f661c26df6d4836c 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
