[pulseaudio-commits] 2 commits - src/pulse src/pulsecore

[Peter Meerwald]

 src/pulse/mainloop.h   |    4 ++--
 src/pulsecore/rtpoll.c |   10 +++-------
 src/pulsecore/rtpoll.h |    4 ----
 3 files changed, 5 insertions(+), 13 deletions(-)

New commits:
commit 07c7295b92e4b7c435ddac0874cffe7b2e9f051d
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed May 20 16:12:43 2015 +0200

    core: Don't export pa_rtpoll_quit(), only used internally
    
    see https://bugs.freedesktop.org/show_bug.cgi?id=89539
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index f427ef3..13c8677 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -557,7 +557,9 @@ static int asyncmsgq_read_work(pa_rtpoll_item *i) {
 
         if (!object && code == PA_MESSAGE_SHUTDOWN) {
             pa_asyncmsgq_done(i->userdata, 0);
-            pa_rtpoll_quit(i->rtpoll);
+            /* Requests the loop to exit. Will cause the next iteration of
+             * pa_rtpoll_run() to return 0 */
+            i->rtpoll->quit = true;
             return 1;
         }
 
@@ -625,12 +627,6 @@ pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_write(pa_rtpoll *p, pa_rtpoll_prior
     return i;
 }
 
-void pa_rtpoll_quit(pa_rtpoll *p) {
-    pa_assert(p);
-
-    p->quit = true;
-}
-
 bool pa_rtpoll_timer_elapsed(pa_rtpoll *p) {
     pa_assert(p);
 
diff --git a/src/pulsecore/rtpoll.h b/src/pulsecore/rtpoll.h
index 4f09ab8..8f0715a 100644
--- a/src/pulsecore/rtpoll.h
+++ b/src/pulsecore/rtpoll.h
@@ -98,8 +98,4 @@ pa_rtpoll_item *pa_rtpoll_item_new_fdsem(pa_rtpoll *p, pa_rtpoll_priority_t prio
 pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_read(pa_rtpoll *p, pa_rtpoll_priority_t prio, pa_asyncmsgq *q);
 pa_rtpoll_item *pa_rtpoll_item_new_asyncmsgq_write(pa_rtpoll *p, pa_rtpoll_priority_t prio, pa_asyncmsgq *q);
 
-/* Requests the loop to exit. Will cause the next iteration of
- * pa_rtpoll_run() to return 0 */
-void pa_rtpoll_quit(pa_rtpoll *p);
-
 #endif

commit 34d80f9a015680ed1cf86b617611fd1dd5e48128
Author: Peter Meerwald <p.meerwald at bct-electronic.com>
Date:   Wed May 20 15:52:46 2015 +0200

    pulse: Document pa_mainloop_quit()'s retval parameter
    
    the argument's name in the header changed to retval to match the implementation
    
    Signed-off-by: Peter Meerwald <pmeerw at pmeerw.net>

diff --git a/src/pulse/mainloop.h b/src/pulse/mainloop.h
index a110541..6e2ca5f 100644
--- a/src/pulse/mainloop.h
+++ b/src/pulse/mainloop.h
@@ -114,8 +114,8 @@ int pa_mainloop_run(pa_mainloop *m, int *retval);
     and is destroyed when the loop is freed. */
 pa_mainloop_api* pa_mainloop_get_api(pa_mainloop*m);
 
-/** Shutdown the main loop */
-void pa_mainloop_quit(pa_mainloop *m, int r);
+/** Shutdown the main loop with the specified return value */
+void pa_mainloop_quit(pa_mainloop *m, int retval);
 
 /** Interrupt a running poll (for threaded systems) */
 void pa_mainloop_wakeup(pa_mainloop *m);