mirrors/pulseaudio
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git synced 2025-11-02 09:01:46 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

Revert "mainloop: fix timeout assignment in pa_mainloop_prepare"

Browse source 
This reverts commit 6b1719d0ed, as it
inadvertently broke the semantics of timeout in the API.

Fixes: https://gitlab.freedesktop.org/pulseaudio/pulseaudio/-/issues/1039
This commit is contained in:
Arun Raghavan 2020-11-23 12:56:41 -05:00 • committed by Arun Raghavan
parent 2ea425d194
commit e6b3edd3c1
2 changed files with 3 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/pulse/mainloop.c
View file

@ -799,10 +799,8 @@ int pa_mainloop_prepare(pa_mainloop *m, int timeout) {
m->prepared_timeout = calc_next_timeout(m); m->prepared_timeout = calc_next_timeout(m);
if (timeout >= 0) { if (timeout >= 0) {
uint64_t u = (uint64_t) timeout * PA_USEC_PER_MSEC; if (timeout < m->prepared_timeout || m->prepared_timeout == PA_USEC_INVALID)
m->prepared_timeout = timeout;
if (u < m->prepared_timeout || m->prepared_timeout == PA_USEC_INVALID)
m->prepared_timeout = u;
} }
} }

2
src/pulse/mainloop.h
View file

@ -85,7 +85,7 @@ void pa_mainloop_free(pa_mainloop* m);
/** Prepare for a single iteration of the main loop. Returns a negative value /** 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 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); int pa_mainloop_prepare(pa_mainloop *m, int timeout);
/** Execute the previously prepared poll. Returns a negative value on error.*/ /** Execute the previously prepared poll. Returns a negative value on error.*/