[pulseaudio-commits] 3 commits - src/modules

[David Henningsson]

 src/modules/alsa/mixer/paths/analog-input.conf             |    1 -
 src/modules/alsa/mixer/paths/analog-output-headphones.conf |    1 -
 src/modules/alsa/module-alsa-card.c                        |    3 +++
 3 files changed, 3 insertions(+), 2 deletions(-)

New commits:
commit ca4942e89cf462e5f8c36ca9b8b689879083af6b
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Apr 16 06:40:40 2013 +0200

    alsa-mixer: Switch to Headphone when Headphone mic jack is plugged in
    
    When a "Headphone Mic" jack becomes available, we do not know if
    a headphone or a mic has been plugged in. Therefore, setting both
    paths to "unknown" is, in theory, the correct thing to do.
    However, in practice, people are more likely to plug in a headphone
    rather than a mic. Therefore, allow autoswitch to the headphone port
    when the jack is plugged in.
    
    A more advanced implementation would consider what was plugged in last
    time depending on what port was selected on the input side at that
    time, and set availability accordingly. However, such an implementation
    will have to wait (probably at least until we have our fancy routing
    system implementation).
    
    Buglink: https://bugs.launchpad.net/bugs/1169143
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-output-headphones.conf b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
index 29358e7..76cd01e 100644
--- a/src/modules/alsa/mixer/paths/analog-output-headphones.conf
+++ b/src/modules/alsa/mixer/paths/analog-output-headphones.conf
@@ -44,7 +44,6 @@ state.unplugged = unknown
 # This jack can be either a headphone *or* a mic. Used on some ASUS netbooks.
 [Jack Headphone Mic]
 required-any = any
-state.plugged = unknown
 
 [Element Hardware Master]
 switch = mute

commit 068a3ec9d4383e92241b72c7d146a42a189473b8
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Wed Apr 24 10:59:42 2013 +0200

    alsa-mixer: Allow input fallback port for devices with no gain control
    
    I recently came across a device without any ALSA-level mixer controls,
    everything was physical knobs on the hardware.
    
    This patch enables that device to get a port too ("Analog Input").
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/mixer/paths/analog-input.conf b/src/modules/alsa/mixer/paths/analog-input.conf
index ecacc9c..c8f8e3c 100644
--- a/src/modules/alsa/mixer/paths/analog-input.conf
+++ b/src/modules/alsa/mixer/paths/analog-input.conf
@@ -23,7 +23,6 @@
 priority = 100
 
 [Element Capture]
-required = volume
 switch = mute
 volume = merge
 override-map.1 = all

commit 2553757922c23068af7e691372ad781a7a0898d1
Author: David Henningsson <david.henningsson at canonical.com>
Date:   Tue Apr 16 14:56:35 2013 +0200

    alsa: Fix ELD access warning on shutdown
    
    The hdmi_eld_changed callback is called by alsa-lib at shutdown.
    In that case, just exit instead of trying to access something with
    already closed handles.
    
    Signed-off-by: David Henningsson <david.henningsson at canonical.com>

diff --git a/src/modules/alsa/module-alsa-card.c b/src/modules/alsa/module-alsa-card.c
index 9b739dc..b37eabc 100644
--- a/src/modules/alsa/module-alsa-card.c
+++ b/src/modules/alsa/module-alsa-card.c
@@ -409,6 +409,9 @@ static int hdmi_eld_changed(snd_hctl_elem_t *elem, unsigned int mask) {
     pa_hdmi_eld eld;
     bool changed = false;
 
+    if (mask == SND_CTL_EVENT_MASK_REMOVE)
+        return 0;
+
     p = find_port_with_eld_device(u->card->ports, device);
     if (p == NULL) {
         pa_log_error("Invalid device changed in ALSA: %d", device);