From e6b3edd3c167f5db35af6b5d9b432034f8280d7f Mon Sep 17 00:00:00 2001 From: Arun Raghavan Date: Mon, 23 Nov 2020 12:56:41 -0500 Subject: Revert "mainloop: fix timeout assignment in pa_mainloop_prepare" This reverts commit 6b1719d0ed100ce5a65f28c3c4d4f3b59f3f56a0, as it inadvertently broke the semantics of timeout in the API. Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1039 --- src/pulse/mainloop.c | 6 ++---- src/pulse/mainloop.h | 2 +- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c index 0cb4af3d3..355935e09 100644 --- a/src/pulse/mainloop.c +++ b/src/pulse/mainloop.c @@ -799,10 +799,8 @@ int pa_mainloop_prepare(pa_mainloop *m, int timeout) { m->prepared_timeout = calc_next_timeout(m); if (timeout >= 0) { - uint64_t u = (uint64_t) timeout * PA_USEC_PER_MSEC; - - if (u < m->prepared_timeout || m->prepared_timeout == PA_USEC_INVALID) - m->prepared_timeout = u; + if (timeout < m->prepared_timeout || m->prepared_timeout == PA_USEC_INVALID) + m->prepared_timeout = timeout; } } diff --git a/src/pulse/mainloop.h b/src/pulse/mainloop.h index 5f8c62672..f1069daf5 100644 --- a/src/pulse/mainloop.h +++ b/src/pulse/mainloop.h @@ -85,7 +85,7 @@ void pa_mainloop_free(pa_mainloop* m); /** Prepare for a single iteration of the main loop. Returns a negative value on error or exit request. timeout specifies a maximum timeout for the subsequent -poll, or -1 for blocking behaviour. .*/ +poll, or -1 for blocking behaviour. The timeout is specified in microseconds. */ int pa_mainloop_prepare(pa_mainloop *m, int timeout); /** Execute the previously prepared poll. Returns a negative value on error.*/ -- cgit v1.2.1