summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2007-09-28 13:15:11 +0000
committerLennart Poettering <lennart@poettering.net>2007-09-28 13:15:11 +0000
commit67b899acc915a3d01623a7d517f81eab7231d11d (patch)
treec5c891751452c792017f91fd701433f6c289098c
parent33f2f497de3c1a99a05cc20172a7b03b38a084e1 (diff)
treat timer_enabled like a real, grown-up boolean variable
git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/lennart@1917 fefdeb5f-60dc-0310-8127-8f9354f1896f
-rw-r--r--src/pulsecore/rtpoll.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 921619d8..de0ffa4f 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -374,13 +374,13 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait) {
#ifdef __linux__
if (!p->dont_use_ppoll)
#endif
- r = ppoll(p->pollfd, p->n_pollfd_used, p->timer_enabled > 0 ? &timeout : NULL, p->rtsig < 0 ? NULL : &p->sigset_unblocked);
+ r = ppoll(p->pollfd, p->n_pollfd_used, p->timer_enabled ? &timeout : NULL, p->rtsig < 0 ? NULL : &p->sigset_unblocked);
#ifdef __linux__
else
#endif
#endif
- r = poll(p->pollfd, p->n_pollfd_used, p->timer_enabled > 0 ? (timeout.tv_sec*1000) + (timeout.tv_nsec / 1000000) : -1);
+ r = poll(p->pollfd, p->n_pollfd_used, p->timer_enabled ? (timeout.tv_sec*1000) + (timeout.tv_nsec / 1000000) : -1);
if (r < 0) {
if (errno == EAGAIN || errno == EINTR)
@@ -403,7 +403,7 @@ int pa_rtpoll_run(pa_rtpoll *p, pa_bool_t wait) {
pa_timespec_add(&p->next_elapse, (pa_timespec_diff(&now, &p->next_elapse) / p->period + 1) * p->period);
} else
- p->timer_enabled = 0;
+ p->timer_enabled = FALSE;
}
/* Let's tell everyone that we left the sleep */