mirror of
https://gitlab.freedesktop.org/pulseaudio/pulseaudio.git
synced 2025-11-03 09:01:50 -05:00
merge 'lennart' branch back into trunk.
git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@1971 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
parent
6687dd0131
commit
a67c21f093
294 changed files with 79057 additions and 11614 deletions
|
|
@ -23,18 +23,19 @@
|
|||
#include <config.h>
|
||||
#endif
|
||||
|
||||
#include <assert.h>
|
||||
#include <stdlib.h>
|
||||
#include <unistd.h>
|
||||
#include <stdio.h>
|
||||
|
||||
#include <pulse/timeval.h>
|
||||
#include <pulse/util.h>
|
||||
|
||||
#include <pulsecore/gccmacro.h>
|
||||
#include <pulse/thread-mainloop.h>
|
||||
|
||||
#include <pulsecore/gccmacro.h>
|
||||
#include <pulsecore/macro.h>
|
||||
|
||||
static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
|
||||
pa_assert_se(pa_threaded_mainloop_in_thread(userdata));
|
||||
fprintf(stderr, "TIME EVENT START\n");
|
||||
pa_threaded_mainloop_signal(userdata, 1);
|
||||
fprintf(stderr, "TIME EVENT END\n");
|
||||
|
|
@ -45,15 +46,15 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
|
|||
pa_threaded_mainloop *m;
|
||||
struct timeval tv;
|
||||
|
||||
m = pa_threaded_mainloop_new();
|
||||
assert(m);
|
||||
a = pa_threaded_mainloop_get_api(m);
|
||||
assert(a);
|
||||
pa_assert_se(m = pa_threaded_mainloop_new());
|
||||
pa_assert_se(a = pa_threaded_mainloop_get_api(m));
|
||||
|
||||
pa_threaded_mainloop_start(m);
|
||||
|
||||
pa_threaded_mainloop_lock(m);
|
||||
|
||||
pa_assert_se(!pa_threaded_mainloop_in_thread(m));
|
||||
|
||||
pa_gettimeofday(&tv);
|
||||
tv.tv_sec += 5;
|
||||
a->time_new(a, &tv, tcb, m);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue