[pulseaudio-commits] r1104 - in /trunk: Makefile.am configure.ac libpulse-mainloop-glib12.pc.in src/Makefile.am src/pulse/glib-mainloop.h src/pulse/glib12-mainloop.c src/tests/mainloop-test.c
svnmailer-noreply at 0pointer.de
svnmailer-noreply at 0pointer.de
Tue Jul 18 12:53:30 PDT 2006
Author: lennart
Date: Tue Jul 18 21:53:29 2006
New Revision: 1104
URL: http://0pointer.de/cgi-bin/viewcvs.cgi?rev=1104&root=pulseaudio&view=rev
Log:
remove glib 1.2 adapter. It started to bitrot and wasn't used by anything anyway.
Removed:
trunk/libpulse-mainloop-glib12.pc.in
trunk/src/pulse/glib12-mainloop.c
Modified:
trunk/Makefile.am
trunk/configure.ac
trunk/src/Makefile.am
trunk/src/pulse/glib-mainloop.h
trunk/src/tests/mainloop-test.c
Modified: trunk/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/Makefile.am?rev=1104&root=pulseaudio&r1=1103&r2=1104&view=diff
==============================================================================
--- trunk/Makefile.am (original)
+++ trunk/Makefile.am Tue Jul 18 21:53:29 2006
@@ -36,11 +36,6 @@
libpulse-mainloop-glib.pc
endif
-if HAVE_GLIB12
-pkgconfig_DATA += \
- libpulse-mainloop-glib12.pc
-endif
-
homepage: all dist doxygen
test -d $$HOME/homepage/private
mkdir -p $$HOME/homepage/private/projects/pulseaudio $$HOME/homepage/private/projects/pulseaudio/doxygen
Modified: trunk/configure.ac
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/configure.ac?rev=1104&root=pulseaudio&r1=1103&r2=1104&view=diff
==============================================================================
--- trunk/configure.ac (original)
+++ trunk/configure.ac Tue Jul 18 21:53:29 2006
@@ -449,37 +449,6 @@
AC_SUBST(HAVE_GLIB20)
AM_CONDITIONAL([HAVE_GLIB20], [test "x$HAVE_GLIB20" = x1])
-#### GLib 1 support (optional) ####
-
-AC_ARG_ENABLE([glib1],
- AC_HELP_STRING([--disable-glib1], [Disable optional GLib 1 support]),
- [
- case "${enableval}" in
- yes) glib1=yes ;;
- no) glib1=no ;;
- *) AC_MSG_ERROR(bad value ${enableval} for --disable-glib1) ;;
- esac
- ],
- [glib1=auto])
-
-if test "x${glib1}" != xno ; then
- PKG_CHECK_MODULES(GLIB12, [ glib >= 1.2.0 ],
- HAVE_GLIB12=1,
- [
- HAVE_GLIB12=0
- if test "x$glib1" = xyes ; then
- AC_MSG_ERROR([*** GLib 1 support not found])
- fi
- ])
-else
- HAVE_GLIB12=0
-fi
-
-AC_SUBST(GLIB12_CFLAGS)
-AC_SUBST(GLIB12_LIBS)
-AC_SUBST(HAVE_GLIB12)
-AM_CONDITIONAL([HAVE_GLIB12], [test "x$HAVE_GLIB12" = x1])
-
#### Avahi support (optional) ####
AC_ARG_ENABLE([avahi],
@@ -677,7 +646,6 @@
libpulse-simple.pc
libpulse-browse.pc
libpulse-mainloop-glib.pc
-libpulse-mainloop-glib12.pc
doxygen/Makefile
doxygen/doxygen.conf
src/pulse/version.h
@@ -710,11 +678,6 @@
ENABLE_GLIB20=yes
fi
-ENABLE_GLIB12=no
-if test "x$HAVE_GLIB12" = "x1" ; then
- ENABLE_GLIB12=yes
-fi
-
ENABLE_AVAHI=no
if test "x$HAVE_AVAHI" = "x1" ; then
ENABLE_AVAHI=yes
@@ -748,15 +711,14 @@
localstatedir: ${localstatedir}
compiler: ${CC}
cflags: ${CFLAGS}
- Have X11: ${ENABLE_X11}
- Enable OSS: ${ENABLE_OSS}
- Enable Alsa: ${ENABLE_ALSA}
- Enable Solaris: ${ENABLE_SOLARIS}
- Enable Glib 2.0: ${ENABLE_GLIB20}
- Enable Glib 1.2: ${ENABLE_GLIB12}
- Enable Avahi: ${ENABLE_AVAHI}
- Enable Jack: ${ENABLE_JACK}
- Enable Async DNS: ${ENABLE_LIBASYNCNS}
- Enable LIRC: ${ENABLE_LIRC}
+ Have X11: ${ENABLE_X11}
+ Enable OSS: ${ENABLE_OSS}
+ Enable Alsa: ${ENABLE_ALSA}
+ Enable Solaris: ${ENABLE_SOLARIS}
+ Enable Glib 2.0: ${ENABLE_GLIB20}
+ Enable Avahi: ${ENABLE_AVAHI}
+ Enable Jack: ${ENABLE_JACK}
+ Enable Async DNS: ${ENABLE_LIBASYNCNS}
+ Enable LIRC: ${ENABLE_LIRC}
Enable TCP Wrappers: ${ENABLE_TCPWRAP}
"
Modified: trunk/src/Makefile.am
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/Makefile.am?rev=1104&root=pulseaudio&r1=1103&r2=1104&view=diff
==============================================================================
--- trunk/src/Makefile.am (original)
+++ trunk/src/Makefile.am Tue Jul 18 21:53:29 2006
@@ -207,11 +207,6 @@
mainloop-test-glib
endif
-if HAVE_GLIB12
-noinst_PROGRAMS += \
- mainloop-test-glib12
-endif
-
mainloop_test_SOURCES = tests/mainloop-test.c
mainloop_test_CFLAGS = $(AM_CFLAGS)
mainloop_test_LDADD = $(AM_LDADD) libpulse.la
@@ -276,11 +271,6 @@
mainloop_test_glib_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB20_CFLAGS) -DGLIB_MAIN_LOOP
mainloop_test_glib_LDADD = $(mainloop_test_LDADD) $(GLIB20_LIBS) libpulse-mainloop-glib.la
mainloop_test_glib_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
-
-mainloop_test_glib12_SOURCES = $(mainloop_test_SOURCES)
-mainloop_test_glib12_CFLAGS = $(mainloop_test_CFLAGS) $(GLIB12_CFLAGS) -DGLIB_MAIN_LOOP
-mainloop_test_glib12_LDADD = $(mainloop_test_LDADD) $(GLIB12_LIBS) libpulse-mainloop-glib12.la
-mainloop_test_glib12_LDFLAGS = $(AM_LDFLAGS) $(BINLDFLAGS)
memblockq_test_SOURCES = tests/memblockq-test.c
memblockq_test_CFLAGS = $(AM_CFLAGS)
@@ -334,11 +324,6 @@
if HAVE_GLIB20
pulseinclude_HEADERS += \
pulse/glib-mainloop.h
-else
-if HAVE_GLIB12
-pulseinclude_HEADERS += \
- pulse/glib-mainloop.h
-endif
endif
lib_LTLIBRARIES = \
@@ -353,11 +338,6 @@
if HAVE_GLIB20
lib_LTLIBRARIES += \
libpulse-mainloop-glib.la
-endif
-
-if HAVE_GLIB12
-lib_LTLIBRARIES += \
- libpulse-mainloop-glib12.la
endif
# Public interface
@@ -460,11 +440,6 @@
libpulse_mainloop_glib_la_CFLAGS = $(AM_CFLAGS) $(GLIB20_CFLAGS)
libpulse_mainloop_glib_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB20_LIBS)
libpulse_mainloop_glib_la_LDFLAGS = -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
-
-libpulse_mainloop_glib12_la_SOURCES = pulse/glib-mainloop.h pulse/glib12-mainloop.c
-libpulse_mainloop_glib12_la_CFLAGS = $(AM_CFLAGS) $(GLIB12_CFLAGS)
-libpulse_mainloop_glib12_la_LIBADD = $(AM_LIBADD) libpulse.la $(GLIB12_LIBS)
-libpulse_mainloop_glib12_la_LDFLAGS = -version-info $(LIBPULSE_MAINLOOP_GLIB_VERSION_INFO)
###################################
# OSS emulation #
Modified: trunk/src/pulse/glib-mainloop.h
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/pulse/glib-mainloop.h?rev=1104&root=pulseaudio&r1=1103&r2=1104&view=diff
==============================================================================
--- trunk/src/pulse/glib-mainloop.h (original)
+++ trunk/src/pulse/glib-mainloop.h Tue Jul 18 21:53:29 2006
@@ -47,13 +47,9 @@
typedef struct pa_glib_mainloop pa_glib_mainloop;
/** Create a new GLIB main loop object for the specified GLIB main
- * loop context. The GLIB 2.0 version takes an argument c for the
+ * loop context. Takes an argument c for the
* GMainContext to use. If c is NULL the default context is used. */
-#if GLIB_MAJOR_VERSION >= 2
pa_glib_mainloop *pa_glib_mainloop_new(GMainContext *c);
-#else
-pa_glib_mainloop *pa_glib_mainloop_new(void);
-#endif
/** Free the GLIB main loop object */
void pa_glib_mainloop_free(pa_glib_mainloop* g);
Modified: trunk/src/tests/mainloop-test.c
URL: http://0pointer.de/cgi-bin/viewcvs.cgi/trunk/src/tests/mainloop-test.c?rev=1104&root=pulseaudio&r1=1103&r2=1104&view=diff
==============================================================================
--- trunk/src/tests/mainloop-test.c (original)
+++ trunk/src/tests/mainloop-test.c Tue Jul 18 21:53:29 2006
@@ -40,13 +40,6 @@
static GMainLoop* glib_main_loop = NULL;
-#if GLIB_MAJOR_VERSION >= 2
-#define GLIB20
-#else
-#undef GLIB20
-#endif
-
-
#else /* GLIB_MAIN_LOOP */
#include <pulse/mainloop.h>
#endif /* GLIB_MAIN_LOOP */
@@ -68,10 +61,8 @@
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
@@ -86,17 +77,10 @@
#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);
@@ -121,10 +105,8 @@
tv.tv_sec += 10;
te = a->time_new(a, &tv, 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
@@ -135,11 +117,7 @@
#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
More information about the pulseaudio-commits
mailing list