Remove unnecessary #includes

[pulseaudio] / src / tests / mainloop-test.c

diff --git a/src/tests/mainloop-test.c b/src/tests/mainloop-test.c
index 300884839424f4b1271f8bc6965b2a3a9a3d3efb..ab23de43c13eb9e37877df0e8e9fadac21de5665 100644 (file)
--- a/src/tests/mainloop-test.c
+++ b/src/tests/mainloop-test.c
@@ -1,20 +1,18 @@
-/* $Id$ */
-
 /***
-  This file is part of polypaudio.
- 
-  polypaudio is free software; you can redistribute it and/or modify
+  This file is part of PulseAudio.
+
+  PulseAudio is free software; you can redistribute it and/or modify
   it under the terms of the GNU Lesser General Public License as published
-  by the Free Software Foundation; either version 2 of the License,
+  by the Free Software Foundation; either version 2.1 of the License,
   or (at your option) any later version.
- 
-  polypaudio is distributed in the hope that it will be useful, but
+
+  PulseAudio is distributed in the hope that it will be useful, but
   WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
   General Public License for more details.
- 
+
   You should have received a copy of the GNU Lesser General Public License
-  along with polypaudio; if not, write to the Free Software
+  along with PulseAudio; if not, write to the Free Software
   Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
   USA.
 ***/
@@ -28,32 +26,28 @@
 #include <sys/time.h>
 #include <assert.h>
 
-#include <polypcore/core-util.h>
-#include <polypcore/gccmacro.h>
+#include <pulse/rtclock.h>
+#include <pulse/timeval.h>
+
+#include <pulsecore/core-util.h>
+#include <pulsecore/core-rtclock.h>
 
 #ifdef GLIB_MAIN_LOOP
 
 #include <glib.h>
-#include <polyp/glib-mainloop.h>
+#include <pulse/glib-mainloop.h>
 
 static GMainLoop* glib_main_loop = NULL;
 
-#if GLIB_MAJOR_VERSION >= 2
-#define GLIB20
-#else
-#undef GLIB20
-#endif 
-
-
 #else /* GLIB_MAIN_LOOP */
-#include <polyp/mainloop.h>
+#include <pulse/mainloop.h>
 #endif /* GLIB_MAIN_LOOP */
 
 static pa_defer_event *de;
 
 static void iocb(pa_mainloop_api*a, pa_io_event *e, int fd, pa_io_event_flags_t f, void *userdata) {
     unsigned char c;
-    read(fd, &c, sizeof(c));
+    pa_assert_se(read(fd, &c, sizeof(c)) >= 0);
     fprintf(stderr, "IO EVENT: %c\n", c < 32 ? '.' : c);
     a->defer_enable(de, 1);
 }
@@ -66,16 +60,14 @@ static void dcb(pa_mainloop_api*a, pa_defer_event *e, void *userdata) {
 static void tcb(pa_mainloop_api*a, pa_time_event *e, const struct timeval *tv, void *userdata) {
     fprintf(stderr, "TIME EVENT\n");
 
-#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
+#if defined(GLIB_MAIN_LOOP)
     g_main_loop_quit(glib_main_loop);
-#elif defined(GLIB_MAIN_LOOP)
-    g_main_quit(glib_main_loop);
 #else
     a->quit(a, 0);
 #endif
 }
 
-int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
+int main(int argc, char *argv[]) {
     pa_mainloop_api *a;
     pa_io_event *ioe;
     pa_time_event *te;
@@ -84,17 +76,10 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
 #ifdef GLIB_MAIN_LOOP
     pa_glib_mainloop *g;
 
-#ifdef GLIB20 
     glib_main_loop = g_main_loop_new(NULL, FALSE);
     assert(glib_main_loop);
 
     g = pa_glib_mainloop_new(NULL);
-#else /* GLIB20 */
-    glib_main_loop = g_main_new(FALSE);
-    assert(glib_main_loop);
-    
-    g = pa_glib_mainloop_new();
-#endif /* GLIB20 */
     assert(g);
 
     a = pa_glib_mainloop_get_api(g);
@@ -115,14 +100,10 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
     de = a->defer_new(a, dcb, NULL);
     assert(de);
 
-    pa_gettimeofday(&tv);
-    tv.tv_sec += 10;
-    te = a->time_new(a, &tv, tcb, NULL);
+    te = a->time_new(a, pa_timeval_rtstore(&tv, pa_rtclock_now() + 2 * PA_USEC_PER_SEC, TRUE), tcb, NULL);
 
-#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
+#if defined(GLIB_MAIN_LOOP)
     g_main_loop_run(glib_main_loop);
-#elif defined(GLIB_MAIN_LOOP)
-    g_main_run(glib_main_loop);
 #else
     pa_mainloop_run(m, NULL);
 #endif
@@ -133,14 +114,10 @@ int main(PA_GCC_UNUSED int argc, PA_GCC_UNUSED char *argv[]) {
 
 #ifdef GLIB_MAIN_LOOP
     pa_glib_mainloop_free(g);
-#ifdef GLIB20
     g_main_loop_unref(glib_main_loop);
-#else
-    g_main_destroy(glib_main_loop);
-#endif
 #else
     pa_mainloop_free(m);
 #endif
-    
+
     return 0;
 }