[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.19-296-gd3c71c9

[Lennart Poettering]

This is an automated email from the git hooks/post-receive script. It was
generated because of a push to the "PulseAudio Sound Server" repository.

The master branch has been updated
      from  a63cf050b0be91310ae6b0b4fa3fa2b0f95e3efa (commit)

- Log -----------------------------------------------------------------
d3c71c9 udev: Use SOUND_CLASS instead of SOUND_FORM_FACTOR when checking for modem
c5fdbea threaded-mainloop: Properly initialise m->n_waiting_for_accept to prevent deadlock
-----------------------------------------------------------------------

Summary of changes:
 src/modules/module-udev-detect.c |    2 +-
 src/pulse/thread-mainloop.c      |    1 +
 2 files changed, 2 insertions(+), 1 deletions(-)

-----------------------------------------------------------------------

commit c5fdbeab85dfe69ebaec92969ec2ce77b105f1df
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Mon Jan 4 21:44:37 2010 -0500

    threaded-mainloop: Properly initialise m->n_waiting_for_accept to prevent deadlock
    
    Compiler optimisations have been seen to initialise
    m->n_waiting_for_accept to a positive non-zero value, so the while() in
    pa_threaded_mainloop_signal() never proceeds. Fix this by properly
    initializing m->n_waiting_for_accept in pa_threaded_mainloop_new().
    
    Patch from Iain Bucław.
    
    https://bugs.launchpad.net/bugs/502992

diff --git a/src/pulse/thread-mainloop.c b/src/pulse/thread-mainloop.c
index 14ed926..1693404 100644
--- a/src/pulse/thread-mainloop.c
+++ b/src/pulse/thread-mainloop.c
@@ -116,6 +116,7 @@ pa_threaded_mainloop *pa_threaded_mainloop_new(void) {
     pa_mainloop_set_poll_func(m->real_mainloop, poll_func, m->mutex);
 
     m->n_waiting = 0;
+    m->n_waiting_for_accept = 0;
 
     return m;
 }

commit d3c71c92ceef143b60a211f4c9b340f5f7beb245
Author: Daniel T Chen <crimsun at ubuntu.com>
Date:   Mon Jan 4 21:53:36 2010 -0500

    udev: Use SOUND_CLASS instead of SOUND_FORM_FACTOR when checking for modem
    
    The fact whether an ALSA card is a modem is stored in the SOUND_CLASS,
    not the SOUND_FORM_FACTOR property. So read it from there.
    
    Patch from Whoopie.

diff --git a/src/modules/module-udev-detect.c b/src/modules/module-udev-detect.c
index a12f7c9..f17695b 100644
--- a/src/modules/module-udev-detect.c
+++ b/src/modules/module-udev-detect.c
@@ -366,7 +366,7 @@ static void process_device(struct userdata *u, struct udev_device *dev) {
         return;
     }
 
-    if ((ff = udev_device_get_property_value(dev, "SOUND_FORM_FACTOR")) &&
+    if ((ff = udev_device_get_property_value(dev, "SOUND_CLASS")) &&
         pa_streq(ff, "modem")) {
         pa_log_debug("Ignoring %s, because it is a modem.", udev_device_get_devpath(dev));
         return;

-- 
hooks/post-receive
PulseAudio Sound Server