[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.12-103-g54afcf2

[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  9f5d052d93a85bb8e4376732fe4473e87bf264f5 (commit)

- Log -----------------------------------------------------------------
54afcf2... inform dsp_empty_socket() *after* we emptied the dsp socket, that it is now empty
-----------------------------------------------------------------------

Summary of changes:
 src/utils/padsp.c |   13 +++++++++----
 1 files changed, 9 insertions(+), 4 deletions(-)

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

commit 54afcf25980662d3033328705ec481c62b223e56
Author: Lennart Poettering <lennart at poettering.net>
Date:   Thu Oct 2 01:02:31 2008 +0200

    inform dsp_empty_socket() *after* we emptied the dsp socket, that it is now empty

diff --git a/src/utils/padsp.c b/src/utils/padsp.c
index f2fdede..2e6e557 100644
--- a/src/utils/padsp.c
+++ b/src/utils/padsp.c
@@ -422,7 +422,7 @@ static void fd_info_unref(fd_info *i) {
     pthread_mutex_lock(&i->mutex);
     assert(i->ref >= 1);
     r = --i->ref;
-        debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref--, now %i\n", i->ref);
+    debug(DEBUG_LEVEL_VERBOSE, __FILE__": ref--, now %i\n", i->ref);
     pthread_mutex_unlock(&i->mutex);
 
     if (r <= 0)
@@ -498,7 +498,6 @@ static void atfork_prepare(void) {
 
     pthread_mutex_lock(&func_mutex);
 
-
     debug(DEBUG_LEVEL_NORMAL, __FILE__": atfork_prepare() exit\n");
 }
 
@@ -550,12 +549,14 @@ static void atfork_child(void) {
         }
 
         if (i->app_fd >= 0) {
-            close(i->app_fd);
+            LOAD_CLOSE_FUNC();
+            _close(i->app_fd);
             i->app_fd = -1;
         }
 
         if (i->thread_fd >= 0) {
-            close(i->thread_fd);
+            LOAD_CLOSE_FUNC();
+            _close(i->thread_fd);
             i->thread_fd = -1;
         }
 
@@ -943,6 +944,10 @@ static int fd_info_copy_data(fd_info *i, int force) {
         api->io_enable(i->io_event, i->io_flags);
     }
 
+    /* So, we emptied the socket now, let's tell dsp_empty_socket()
+     * about this */
+    pa_threaded_mainloop_signal(i->mainloop, 0);
+
     return 0;
 }
 

-- 
hooks/post-receive
PulseAudio Sound Server