Ticket #430: pulseaudio-threaded-mainloop-signals-trunk.patch

src/pulse/internal.h

@@ -221 +221 @@
 int pa_context_handle_error(pa_context *c, uint32_t command, pa_tagstruct *t, pa_bool_t fail);
 pa_operation* pa_context_send_simple_command(pa_context *c, uint32_t command, void (*internal_callback)(pa_pdispatch *pd, uint32_t command, uint32_t tag, pa_tagstruct *t, void *userdata), void (*cb)(void), void *userdata);
 
+int pa_signal_initialized(pa_mainloop_api *a);
+
 void pa_stream_set_state(pa_stream *s, pa_stream_state_t st);
 
 pa_tagstruct *pa_tagstruct_command(pa_context *c, uint32_t command, uint32_t *tag);

src/pulse/mainloop-signal.c

@@ -45 +45 @@
 #include <pulsecore/log.h>
 #include <pulsecore/macro.h>
 
+#include "internal.h"
 #include "mainloop-signal.h"
 
 struct pa_signal_event {
@@ -141 +142 @@
     return 0;
 }
 
+int pa_signal_initialized(pa_mainloop_api *a) {
+    return api && api == a;
+}
+
 void pa_signal_done(void) {
     while (signals)
         pa_signal_free(signals);

src/pulse/thread-mainloop.c

@@ -43 +43 @@
 #include <pulsecore/mutex.h>
 #include <pulsecore/macro.h>
 
+#include "internal.h"
 #include "thread-mainloop.h"
 
 struct pa_threaded_mainloop {
@@ -77 +78 @@
 static void thread(void *userdata) {
     pa_threaded_mainloop *m = userdata;
 
+
 #ifndef OS_IS_WIN32
-    sigset_t mask;
+    if (pa_signal_initialized(pa_threaded_mainloop_get_api(m))) {
+        sigset_t mask;
 
-    /* Make sure that signals are delivered to the main thread */
-    sigfillset(&mask);
-    pthread_sigmask(SIG_BLOCK, &mask, NULL);
+        /* Make sure that signals are delivered to the main thread */
+        sigfillset(&mask);
+        pthread_sigmask(SIG_BLOCK, &mask, NULL);
+    }
 #endif
 
     pa_mutex_lock(m->mutex);