[pulseaudio-commits] [Git][pulseaudio/pulseaudio][master] 2 commits: alsa-mixer: don't make lineout unavailable when headphones are plugged in

[Arun Raghavan]

Arun Raghavan pushed to branch master at PulseAudio / pulseaudio


Commits:
78dfb804 by Tanu Kaskinen at 2018-10-28T11:10:36Z
alsa-mixer: don't make lineout unavailable when headphones are plugged in

This reverts commit 66f97c35bda9524985b8d34d9a7dbfa9b1359df5. The commit
message was:

    alsa-mixer: Disable line-out if headphone jack is plugged

    Line-out gets muted when headphones are plugged in on HDA cards, encode
    this in the line-out path so pulse can match that state.

I don't think the mentioned auto-muting happens any more by default,
and some users want to use lineout while having headphones plugged in.

Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/issues/583

- - - - -
3e80e0f7 by Tanu Kaskinen at 2018-10-28T11:15:53Z
alsa-mixer: swap lineout and headphone priorities

Headphones should have higher priority than lineout. Many people have
speakers always connected to lineout, and when plugging in headphones,
the audio should move to the headphones, which requires headphones
to have higher priority than lineout.

Previously this was handled by marking lineout unavailable when plugging
in headphones, but we don't do that any more.

- - - - -


3 changed files:

- src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
- src/modules/alsa/mixer/paths/analog-output-headphones.conf
- src/modules/alsa/mixer/paths/analog-output-lineout.conf


Changes:

=====================================
src/modules/alsa/mixer/paths/analog-output-headphones-2.conf
=====================================
@@ -18,7 +18,7 @@
 ; See analog-output.conf.common for an explanation on the directives
 
 [General]
-priority = 89
+priority = 98
 description-key = analog-output-headphones
 
 [Properties]


=====================================
src/modules/alsa/mixer/paths/analog-output-headphones.conf
=====================================
@@ -18,7 +18,7 @@
 ; See analog-output.conf.common for an explanation on the directives
 
 [General]
-priority = 90
+priority = 99
 description-key = analog-output-headphones
 
 [Properties]


=====================================
src/modules/alsa/mixer/paths/analog-output-lineout.conf
=====================================
@@ -14,7 +14,7 @@
 # along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
 
 [General]
-priority = 99
+priority = 90
 description-key = analog-output-lineout
 
 [Jack Line Out]
@@ -25,14 +25,6 @@ state.plugged = unknown
 state.unplugged = unknown
 required-any = any
 
-[Jack Headphone]
-state.plugged = no
-state.unplugged = unknown
-
-[Jack Front Headphone]
-state.plugged = no
-state.unplugged = unknown
-
 [Jack Front Line Out]
 required-any = any
 



View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/874fe7b15d78fb7d07d578972d1b7578c6ee29a5...3e80e0f7779f6d24642aa84b95c277f839034792

-- 
View it on GitLab: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/compare/874fe7b15d78fb7d07d578972d1b7578c6ee29a5...3e80e0f7779f6d24642aa84b95c277f839034792
You're receiving this email because of your account on gitlab.freedesktop.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.freedesktop.org/archives/pulseaudio-commits/attachments/20181112/8b36c681/attachment-0001.html>