[muine] Bug 559892 – [PATCH] Drop xine backend
- From: Priit Laes <plaes src gnome org>
- To: svn-commits-list gnome org
- Subject: [muine] Bug 559892 – [PATCH] Drop xine backend
- Date: Wed, 22 Jul 2009 20:21:36 +0000 (UTC)
commit 4ec1c8ef6a576c22f57a5d5176d3878833a21370
Author: Priit Laes <plaes plaes org>
Date: Wed Jul 22 23:20:22 2009 +0300
Bug 559892 â?? [PATCH] Drop xine backend
* configure.in, libmuine/Makefile.am, libmuine/player-xine.c:
ChangeLog | 7 +
configure.in | 19 +--
libmuine/Makefile.am | 13 +-
libmuine/player-xine.c | 636 ------------------------------------------------
4 files changed, 10 insertions(+), 665 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index a59d6eb..c38c620 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2009-07-22 Priit Laes <plaes plaes org>
+ Bug 559892 â?? [PATCH] Drop xine backend
+
+ * configure.in, libmuine/Makefile.am, libmuine/player-xine.c:
+ Drop Xine backend and use gstreamer-0.10 by default.
+
+2009-07-22 Priit Laes <plaes plaes org>
+
Bug 572841 â?? FLAC files are not imported
* src/Metadata.cs: Make metadata parsing more robust.
diff --git a/configure.in b/configure.in
index b9aeb74..95973f7 100644
--- a/configure.in
+++ b/configure.in
@@ -21,7 +21,6 @@ AM_PATH_GLIB_2_0
dnl Version dependencies
-LIBXINE_REQUIRED=1.0.0
GSTREAMER_REQUIRED=0.10.0
GLIB_REQUIRED=2.14
GTK_REQUIRED=2.8
@@ -31,22 +30,6 @@ GTKSHARP_REQUIRED=2.12.9
TAGLIBSHARP_REQUIRED=2.0.3
MONODOC_REQUIRED=1.1.9
-dnl Audio backend stuff
-AC_ARG_ENABLE(xine, [ --enable-xine=[no/yes] compile with libxine support.],,enable_xine=no)
-
-if test "x$enable_xine" = "xyes"; then
- audio_pkgconfig="libxine >= $LIBXINE_REQUIRED"
- have_xine=yes
- AC_DEFINE(HAVE_XINE, 1, xine support)
-else
- audio_pkgconfig="gstreamer-0.10 >= $GSTREAMER_REQUIRED"
- have_gstreamer=yes
- AC_DEFINE(HAVE_GST, 1, gstreamer 0.10.x support)
-fi
-
-AM_CONDITIONAL(HAVE_XINE, test "x$have_xine" = "xyes")
-AM_CONDITIONAL(HAVE_GST, test "x$have_gstreamer" = "xyes")
-
dnl Pkgconfig
PKG_PROG_PKG_CONFIG
PKG_CHECK_MODULES(MUINE,
@@ -55,7 +38,7 @@ PKG_CHECK_MODULES(MUINE,
glib-2.0 >= $GLIB_REQUIRED \
gtk+-2.0 >= $GTK_REQUIRED \
gnome-icon-theme >= $ICON_THEME_REQUIRED \
- $audio_pkgconfig)
+ gstreamer-0.10 >= $GSTREAMER_REQUIRED)
AC_SUBST(MUINE_CFLAGS)
AC_SUBST(MUINE_LIBS)
diff --git a/libmuine/Makefile.am b/libmuine/Makefile.am
index 6363590..e5cc7af 100644
--- a/libmuine/Makefile.am
+++ b/libmuine/Makefile.am
@@ -1,6 +1,6 @@
INCLUDES = \
-I$(top_srcdir) \
- -DG_LOG_DOMAIN=\"libmuine\" \
+ -DG_LOG_DOMAIN=\"libmuine\" \
-DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
$(MUINE_CFLAGS) \
$(WARN_CFLAGS) \
@@ -13,19 +13,10 @@ INCLUDES = \
muinelibdir = $(pkglibdir)
muinelib_LTLIBRARIES = libmuine.la
-if HAVE_XINE
-xine_sources = player-xine.c
-endif
-
-if HAVE_GST
-gst_sources = player-gst.c
-endif
-
libmuine_la_SOURCES = \
- $(xine_sources) \
- $(gst_sources) \
macros.h \
player.h \
+ player-gst.c \
pointer-list-model.c \
pointer-list-model.h \
db.c \
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]