mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-04 13:29:59 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix horribly broken glib timeout event handling

Browse source 
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1138 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2006-07-22 00:54:23 +00:00
parent b345af2273
commit 07a1c45cc1
1 changed files with 5 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

12
src/pulse/glib-mainloop.c
View file

@ -312,7 +312,7 @@ static void glib_time_restart(pa_time_event*e, const struct timeval *tv) {
assert(e);
assert(!e->dead);
if (e->enabled && !!tv)
if (e->enabled && !tv)
e->mainloop->n_enabled_time_events--;
else if (!e->enabled && tv)
e->mainloop->n_enabled_time_events++;
@ -476,13 +476,11 @@ static gboolean prepare_func(GSource *source, gint *timeout) {
tvnow.tv_sec = now.tv_sec;
tvnow.tv_usec = now.tv_usec;
usec = pa_timeval_diff(&t->timeval, &tvnow);
if (usec <= 0) {
if (pa_timeval_cmp(&t->timeval, &tvnow) <= 0) {
*timeout = 0;
return TRUE;
}
}
usec = pa_timeval_diff(&t->timeval, &tvnow);
*timeout = (gint) (usec / 1000);
} else
*timeout = -1;
@ -554,7 +552,7 @@ static gboolean dispatch_func(GSource *source, PA_GCC_UNUSED GSourceFunc callbac
tvnow.tv_sec = now.tv_sec;
tvnow.tv_usec = now.tv_usec;
if (pa_timeval_cmp(&t->timeval, &tvnow) < 0) {
if (pa_timeval_cmp(&t->timeval, &tvnow) <= 0) {
t->callback(&g->api, t, &t->timeval, t->userdata);
return TRUE;
}