diff options
| -rw-r--r-- | src/Makefile.am | 9 | ||||
| -rw-r--r-- | src/polyp/thread-mainloop.c | 50 |
2 files changed, 48 insertions, 11 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index 66e20af5..ee7b2325 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -188,7 +188,8 @@ noinst_PROGRAMS = \ voltest \ memblockq-test \ sync-playback \ - channelmap-test + channelmap-test \ + thread-mainloop-test if HAVE_SIGXCPU noinst_PROGRAMS += \ @@ -206,12 +207,6 @@ noinst_PROGRAMS += \ mainloop-test-glib12 endif -# FIXME: We need to make thread-mainloop win32-compatible first -if !OS_IS_WIN32 -noinst_PROGRAMS += \ - thread-mainloop-test -endif - mainloop_test_SOURCES = tests/mainloop-test.c mainloop_test_CFLAGS = $(AM_CFLAGS) mainloop_test_LDADD = $(AM_LDADD) libpolyp-@PA_MAJORMINOR@.la diff --git a/src/polyp/thread-mainloop.c b/src/polyp/thread-mainloop.c index 62813acd..6c14a1d3 100644 --- a/src/polyp/thread-mainloop.c +++ b/src/polyp/thread-mainloop.c @@ -42,7 +42,8 @@ #include "mainloop.h" #include "thread-mainloop.h" -#ifndef OS_IS_WIN32 +/* FIXME: Add defined(OS_IS_WIN32) when support is added */ +#if defined(HAVE_PTHREAD) struct pa_threaded_mainloop { pa_mainloop *real_mainloop; @@ -219,8 +220,49 @@ pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m) { return pa_mainloop_get_api(m->real_mainloop); } -#else /* OS_IS_WIN32 */ +#else /* defined(OS_IS_WIN32) || defined(HAVE_PTHREAD) */ -// FIXME: Use Win32 primitives +pa_threaded_mainloop *pa_threaded_mainloop_new(void) { + pa_log_error(__FILE__": Threaded main loop not supported on this platform"); + return NULL; +} + +void pa_threaded_mainloop_free(pa_threaded_mainloop* m) { + assert(0); +} + +int pa_threaded_mainloop_start(pa_threaded_mainloop *m) { + assert(0); + return -1; +} + +void pa_threaded_mainloop_stop(pa_threaded_mainloop *m) { + assert(0); +} + +void pa_threaded_mainloop_lock(pa_threaded_mainloop *m) { + assert(0); +} + +void pa_threaded_mainloop_unlock(pa_threaded_mainloop *m) { + assert(0); +} + +void pa_threaded_mainloop_wait(pa_threaded_mainloop *m) { + assert(0); +} + +void pa_threaded_mainloop_signal(pa_threaded_mainloop *m, int wait_for_release) { + assert(0); +} + +int pa_threaded_mainloop_get_retval(pa_threaded_mainloop *m) { + assert(0); +} + +pa_mainloop_api* pa_threaded_mainloop_get_api(pa_threaded_mainloop*m) { + assert(0); + return NULL; +} -#endif /* OS_IS_WIN32 */ +#endif /* defined(OS_IS_WIN32) || defined(HAVE_PTHREAD) */ |