diff options
| author | Lennart Poettering <lennart@poettering.net> | 2009-06-22 23:09:46 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2009-06-22 23:09:46 +0200 |
| commit | fc33f7ee97da6a8b7263620775b7b74b4c754402 (patch) | |
| tree | 519635b1f72acc7613b4b7c4ad70fbc39ab3901b /src/daemon/main.c | |
| parent | 048e576a6dfe2bfe62fa33c74c30cc34057ee740 (diff) | |
| parent | e4d914c945c13d23b131d7ba75fbdd03cb6d0043 (diff) | |
Merge most of elmarco/rtclock2
Merge commit 'e4d914c945c13d23b131d7ba75fbdd03cb6d0043'
Diffstat (limited to 'src/daemon/main.c')
| -rw-r--r-- | src/daemon/main.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/daemon/main.c b/src/daemon/main.c index 2ecd6c2f..22759a38 100644 --- a/src/daemon/main.c +++ b/src/daemon/main.c @@ -73,6 +73,7 @@ #include <pulsecore/lock-autospawn.h> #include <pulsecore/winsock.h> #include <pulsecore/core-error.h> +#include <pulsecore/core-rtclock.h> #include <pulsecore/core.h> #include <pulsecore/memblock.h> #include <pulsecore/module.h> @@ -131,7 +132,7 @@ static void message_cb(pa_mainloop_api*a, pa_time_event*e, const struct timeval } pa_timeval_add(pa_gettimeofday(&tvnext), 100000); - a->time_restart(e, &tvnext); + a->rtclock_time_restart(e, &tvnext); } #endif @@ -845,7 +846,7 @@ int main(int argc, char *argv[]) { #endif #ifdef OS_IS_WIN32 - win32_timer = pa_mainloop_get_api(mainloop)->time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL); + win32_timer = pa_mainloop_get_api(mainloop)->rtclock_time_new(pa_mainloop_get_api(mainloop), pa_gettimeofday(&win32_tv), message_cb, NULL); #endif oil_init(); |