Add stubs for the threaded main loop so that we can compile it on

non-supported platforms (still can't run it though).

git-svn-id: file:///home/lennart/svn/public/pulseaudio/trunk@834 fefdeb5f-60dc-0310-8127-8f9354f1896f

diff --git a/src/Makefile.am b/src/Makefile.am
index 66e20af594c88e37001b3ef9cbb788f054d246bd..ee7b2325f90b204b494a04ae7c2484220440124c 100644 (file)
--- 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 62813acd3a3199ce36526d10c05c3fc640accb02..6c14a1d310c88dfd6a34aa245243e106620fd945 100644 (file)
--- 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) */