+/* $Id$ */
+
+/***
+ This file is part of polypaudio.
+
+ polypaudio 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,
+ or (at your option) any later version.
+
+ polypaudio 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
+ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
+ USA.
+***/
+
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+
#include <stdio.h>
#include <unistd.h>
#include <sys/time.h>
#include <assert.h>
#ifdef GLIB_MAIN_LOOP
+
#include <glib.h>
#include "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 "mainloop.h"
-#endif
+#endif /* GLIB_MAIN_LOOP */
static struct pa_defer_event *de;
static void tcb(struct pa_mainloop_api*a, struct pa_time_event *e, const struct timeval *tv, void *userdata) {
fprintf(stderr, "TIME EVENT\n");
-#ifdef GLIB_MAIN_LOOP
+#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
g_main_loop_quit(glib_main_loop);
+#elif defined(GLIB_MAIN_LOOP)
+ g_main_quit(glib_main_loop);
#else
a->quit(a, 0);
#endif
#ifdef GLIB_MAIN_LOOP
struct 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);
assert(a);
-#else
+#else /* GLIB_MAIN_LOOP */
struct pa_mainloop *m;
m = pa_mainloop_new();
a = pa_mainloop_get_api(m);
assert(a);
-#endif
+#endif /* GLIB_MAIN_LOOP */
ioe = a->io_new(a, 0, PA_IO_EVENT_INPUT, iocb, NULL);
assert(ioe);
tv.tv_sec += 10;
te = a->time_new(a, &tv, tcb, NULL);
-#ifdef GLIB_MAIN_LOOP
+#if defined(GLIB_MAIN_LOOP) && defined(GLIB20)
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
#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