#include <pulse/utf8.h>
#include <pulse/util.h>
#include <pulse/i18n.h>
+#include <pulse/mainloop.h>
+#include <pulse/timeval.h>
#include <pulsecore/winsock.h>
#include <pulsecore/core-error.h>
pa_assert(c);
pa_assert(c->mainloop);
+ if (usec == PA_USEC_INVALID)
+ return c->mainloop->time_new(c->mainloop, NULL, cb, userdata);
+
pa_timeval_rtstore(&tv, usec, c->use_rtclock);
return c->mainloop->time_new(c->mainloop, &tv, cb, userdata);
pa_assert(c);
pa_assert(c->mainloop);
- pa_timeval_rtstore(&tv, usec, c->use_rtclock);
-
- c->mainloop->time_restart(e, &tv);
+ if (usec == PA_USEC_INVALID)
+ c->mainloop->time_restart(e, NULL);
+ else {
+ pa_timeval_rtstore(&tv, usec, c->use_rtclock);
+ c->mainloop->time_restart(e, &tv);
+ }
}
}
/* Time events */
-static pa_usec_t timeval_load(struct timeval *tv) {
+static pa_usec_t timeval_load(const struct timeval *tv) {
pa_bool_t is_rtclock;
+ struct timeval ttv;
if (!tv)
return PA_USEC_INVALID;
- is_rtclock = !!(tv->tv_usec & PA_TIMEVAL_RTCLOCK);
- tv->tv_usec &= ~PA_TIMEVAL_RTCLOCK;
+ ttv = *tv;
+ is_rtclock = !!(ttv.tv_usec & PA_TIMEVAL_RTCLOCK);
+ ttv.tv_usec &= ~PA_TIMEVAL_RTCLOCK;
if (!is_rtclock)
- pa_rtclock_from_wallclock(tv);
+ pa_rtclock_from_wallclock(&ttv);
- return pa_timeval_load(tv);
+ return pa_timeval_load(&ttv);
}
static pa_time_event* mainloop_time_new(
pa_mainloop *m;
pa_time_event *e;
pa_usec_t t;
- struct timeval ttv;
pa_assert(a);
pa_assert(a->userdata);
pa_assert(callback);
- t = timeval_load(tv? ttv = *tv, &ttv : NULL);
+ t = timeval_load(tv);
+
m = a->userdata;
pa_assert(a == &m->api);
static void mainloop_time_restart(pa_time_event *e, const struct timeval *tv) {
pa_bool_t valid;
pa_usec_t t;
- struct timeval ttv;
pa_assert(e);
pa_assert(!e->dead);
- t = timeval_load(tv? ttv = *tv, &ttv : NULL);
+ t = timeval_load(tv);
+
valid = (t != PA_USEC_INVALID);
if (e->enabled && !valid) {
pa_assert(e->mainloop->n_enabled_time_events > 0);
struct timeval* pa_timeval_rtstore(struct timeval *tv, pa_usec_t v, pa_bool_t rtclock) {
pa_assert(tv);
+ if (v == PA_USEC_INVALID)
+ return NULL;
+
pa_timeval_store(tv, v);
if (rtclock)
#include <pulse/gccmacro.h>
#include <pulsecore/core-util.h>
+#include <pulsecore/core-rtclock.h>
#ifdef GLIB_MAIN_LOOP