summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPeter Meerwald <p.meerwald@bct-electronic.com>2014-10-28 13:17:00 +0100
committerPeter Meerwald <pmeerw@pmeerw.net>2014-11-09 22:53:02 +0100
commit26385914972b4f25282c91efd9740a4b118d1852 (patch)
treede44928012b5c4a86f0bb6a3e82f47cb00220bb4
parentb5b4a1078cfeb4f35ab808a1a2be9208bd4595fe (diff)
downloadpulseaudio-26385914972b4f25282c91efd9740a4b118d1852.tar.gz
rtpoll: Fix condition for DEBUG_TIMING output
Signed-off-by: Peter Meerwald <pmeerw@pmeerw.net>
-rw-r--r--src/pulsecore/rtpoll.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/src/pulsecore/rtpoll.c b/src/pulsecore/rtpoll.c
index 09e5e8a34..c657cb6f9 100644
--- a/src/pulsecore/rtpoll.c
+++ b/src/pulsecore/rtpoll.c
@@ -298,10 +298,12 @@ int pa_rtpoll_run(pa_rtpoll *p, bool wait_op) {
pa_usec_t now = pa_rtclock_now();
p->awake = now - p->timestamp;
p->timestamp = now;
- if (!wait_op || p->quit || p->timer_enabled)
+ if (wait_op && !p->quit && p->timer_enabled)
pa_log("poll timeout: %d ms ",(int) ((timeout.tv_sec*1000) + (timeout.tv_usec / 1000)));
- else
+ else if (q->quit)
pa_log("poll timeout is ZERO");
+ else
+ pa_log("poll timeout is FOREVER");
}
#endif