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

mainloop: pass monotonic times back to user if he passed monotonic times to us

Browse source
This commit is contained in:
Lennart Poettering 2009-09-18 04:21:01 +02:00
parent c024aeaae9
commit d6291511a2
1 changed files with 16 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

22
src/pulse/mainloop.c
View file

@ -78,6 +78,7 @@ struct pa_time_event {
pa_bool_t dead:1; pa_bool_t dead:1;
pa_bool_t enabled:1; pa_bool_t enabled:1;
pa_bool_t use_rtclock:1;
pa_usec_t time; pa_usec_t time;
pa_time_event_cb_t callback; pa_time_event_cb_t callback;
@ -315,17 +316,22 @@ static void mainloop_defer_set_destroy(pa_defer_event *e, pa_defer_event_destroy
} }
/* Time events */ /* Time events */
static pa_usec_t make_rt(const struct timeval *tv) { static pa_usec_t make_rt(const struct timeval *tv, pa_bool_t *use_rtclock) {
struct timeval ttv; struct timeval ttv;
if (!tv) if (!tv) {
*use_rtclock = FALSE;
return PA_USEC_INVALID; return PA_USEC_INVALID;
}
if (tv->tv_usec & PA_TIMEVAL_RTCLOCK) { if (tv->tv_usec & PA_TIMEVAL_RTCLOCK) {
ttv = *tv; ttv = *tv;
ttv.tv_usec &= ~PA_TIMEVAL_RTCLOCK; ttv.tv_usec &= ~PA_TIMEVAL_RTCLOCK;
tv = pa_rtclock_from_wallclock(&ttv); tv = pa_rtclock_from_wallclock(&ttv);
}
*use_rtclock = TRUE;
} else
*use_rtclock = FALSE;
return pa_timeval_load(tv); return pa_timeval_load(tv);
} }
@ -339,12 +345,13 @@ static pa_time_event* mainloop_time_new(
pa_mainloop *m; pa_mainloop *m;
pa_time_event *e; pa_time_event *e;
pa_usec_t t; pa_usec_t t;
pa_bool_t use_rtclock = FALSE;
pa_assert(a); pa_assert(a);
pa_assert(a->userdata); pa_assert(a->userdata);
pa_assert(callback); pa_assert(callback);
t = make_rt(tv); t = make_rt(tv, &use_rtclock);
m = a->userdata; m = a->userdata;
pa_assert(a == &m->api); pa_assert(a == &m->api);
@ -354,6 +361,7 @@ static pa_time_event* mainloop_time_new(
if ((e->enabled = (t != PA_USEC_INVALID))) { if ((e->enabled = (t != PA_USEC_INVALID))) {
e->time = t; e->time = t;
e->use_rtclock= use_rtclock;
m->n_enabled_time_events++; m->n_enabled_time_events++;
@ -379,11 +387,12 @@ static pa_time_event* mainloop_time_new(
static void mainloop_time_restart(pa_time_event *e, const struct timeval *tv) { static void mainloop_time_restart(pa_time_event *e, const struct timeval *tv) {
pa_bool_t valid; pa_bool_t valid;
pa_usec_t t; pa_usec_t t;
pa_bool_t use_rtclock = FALSE;
pa_assert(e); pa_assert(e);
pa_assert(!e->dead); pa_assert(!e->dead);
t = make_rt(tv); t = make_rt(tv, &use_rtclock);
valid = (t != PA_USEC_INVALID); valid = (t != PA_USEC_INVALID);
if (e->enabled && !valid) { if (e->enabled && !valid) {
@ -394,6 +403,7 @@ static void mainloop_time_restart(pa_time_event *e, const struct timeval *tv) {
if ((e->enabled = valid)) { if ((e->enabled = valid)) {
e->time = t; e->time = t;
e->use_rtclock = use_rtclock;
pa_mainloop_wakeup(e->mainloop); pa_mainloop_wakeup(e->mainloop);
} }
@ -779,7 +789,7 @@ static unsigned dispatch_timeout(pa_mainloop *m) {
/* Disable time event */ /* Disable time event */
mainloop_time_restart(e, NULL); mainloop_time_restart(e, NULL);
e->callback(&m->api, e, pa_timeval_rtstore(&tv, e->time, FALSE), e->userdata); e->callback(&m->api, e, pa_timeval_rtstore(&tv, e->time, e->use_rtclock), e->userdata);
r++; r++;
} }