sound-juicer r2280 - in trunk: . src

[hadess svn gnome org]

Author: hadess
Date: Wed Sep  3 19:13:09 2008
New Revision: 2280
URL: http://svn.gnome.org/viewvc/sound-juicer?rev=2280&view=rev

Log:
2008-09-03  Bastien Nocera  <hadess hadess net>

	* configure.in:
	* src/Makefile.am:
	* src/gsttaglib.cc:
	* src/gsttaglib.h:
	* src/sj-main.c (main): Remove taglib based id3mux plugin
	(Closes: #522411)



Removed:
   trunk/src/gsttaglib.cc
   trunk/src/gsttaglib.h
Modified:
   trunk/ChangeLog
   trunk/configure.in
   trunk/src/Makefile.am
   trunk/src/sj-main.c

Modified: trunk/configure.in
==============================================================================
--- trunk/configure.in	(original)
+++ trunk/configure.in	Wed Sep  3 19:13:09 2008
@@ -92,17 +92,6 @@
 AC_CHECK_FUNCS(mb_SetProxyCreds)
 LIBS="$oldlibs"
 
-# Find TagLib for the internal copy of id3mux
-PKG_CHECK_MODULES([TAGLIB],[taglib],[have_taglib=yes],[have_taglib=no])
-AC_SUBST([TAGLIB_CFLAGS]) 
-AC_SUBST([TAGLIB_LIBS])
-
-if test "$have_taglib" != "yes"; then
-	AC_MSG_WARN([taglib not found, cannot handle missing id3mux])
-fi
-
-AM_CONDITIONAL([HAVE_TAGLIB],[test "$have_taglib" = "yes"])
-
 # Find how and where to put the GConf schemas
 AC_PATH_PROG(GCONFTOOL, gconftool-2, no)
 if test "$GCONFTOOL" = "no"; then

Modified: trunk/src/Makefile.am
==============================================================================
--- trunk/src/Makefile.am	(original)
+++ trunk/src/Makefile.am	Wed Sep  3 19:13:09 2008
@@ -63,19 +63,6 @@
 sound_juicer_LDFLAGS = \
 	$(AM_LDFLAGS)
 
-if HAVE_TAGLIB
-sound_juicer_SOURCES += \
-	gsttaglib.cc \
-	gsttaglib.h
-
-sound_juicer_CXXFLAGS += \
-	$(TAGLIB_CFLAGS)
-
-sound_juicer_LDADD += \
-	$(TAGLIB_LIBS)	\
-	-lgsttag-0.10
-endif
-
 BACON_DIR=$(srcdir)/../../libbacon/src/
 BACON_FILES=bacon-message-connection.h bacon-message-connection.c
 

Modified: trunk/src/sj-main.c
==============================================================================
--- trunk/src/sj-main.c	(original)
+++ trunk/src/sj-main.c	Wed Sep  3 19:13:09 2008
@@ -1790,12 +1790,6 @@
 
   sj_play_init ();
 
-#if HAVE_TAGLIB
-  /* See if the system supports id3mux, and if not register our own */
-  if (!gst_default_registry_check_feature_version ("id3mux", 0, 10, 0))
-    id3mux_register ();
-#endif
-
   selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (track_listview));
   gtk_tree_selection_set_mode (selection, GTK_SELECTION_SINGLE);