[pulseaudio-commits] [SCM] PulseAudio Sound Server branch, master, updated. v0.9.16-test4-13-g23a294c

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

- Log -----------------------------------------------------------------
23a294c Correctly deal with events in the past in calc_next_timeout
-----------------------------------------------------------------------

Summary of changes:
 src/pulse/mainloop.c |   13 ++++++-------
 1 files changed, 6 insertions(+), 7 deletions(-)

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

commit 23a294c97e62e0bee9b17b1f8ad20a39e1ba15da
Author: Maxim Levitsky <maximlevitsky at gmail.com>
Date:   Sun Aug 9 03:01:08 2009 +0300

    Correctly deal with events in the past in calc_next_timeout
    
    pa_usec_t is unsigned, thus it will always be >= 0
    This makes gstreamer pulse mixer work again
    
    This fixes a gstreamer mixer regression, when it can't control the volume,
    after few changes.

diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index c418d10..93a4742 100644
--- a/src/pulse/mainloop.c
+++ b/src/pulse/mainloop.c
@@ -765,23 +765,22 @@ static pa_time_event* find_next_time_event(pa_mainloop *m) {
 
 static int calc_next_timeout(pa_mainloop *m) {
     pa_time_event *t;
-    pa_usec_t usec;
+    pa_usec_t clock_now;
 
     if (!m->n_enabled_time_events)
         return -1;
 
-    t = find_next_time_event(m);
-    pa_assert(t);
+    pa_assert_se(t = find_next_time_event(m));
 
-    if (t->time == 0)
+    if (t->time <= 0)
         return 0;
 
-    usec = t->time - pa_rtclock_now();
+    clock_now = pa_rtclock_now();
 
-    if (usec <= 0)
+    if (t->time <= clock_now)
         return 0;
 
-    return (int) (usec / 1000); /* in milliseconds */
+    return (int) ((t->time - clock_now) / 1000); /* in milliseconds */
 }
 
 static int dispatch_timeout(pa_mainloop *m) {

-- 
hooks/post-receive
PulseAudio Sound Server