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

diff --git a/src/pulse/mainloop.c b/src/pulse/mainloop.c
index 0cb4af3d3e202e3dd18c5a1ad8a76165fdb5cb32..355935e0967ca95ebc13e30044c5b2410fae7259 100644 (file)
--- 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 5f8c626724fc6235973befebc6184372cc0d40c6..f1069daf5062e00d1d68454f21d6fd04c0ef7bee 100644 (file)
--- 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.*/