[sound-juicer] Remove cdio metadata backend



commit 64e51bb4f1b20da8724dfd41b242e4dea1f48884
Author: Bastien Nocera <hadess hadess net>
Date:   Thu Apr 22 13:50:37 2010 +0100

    Remove cdio metadata backend
    
    It's broken, and its license is not compatible with sound-juicer's
    anyway, so disable it.
    
    The gvfs backend already knows how to get CD-Text metadata, and provide
    fallbacks.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=584225

 configure.in                   |    9 --
 libjuicer/Makefile.am          |    6 -
 libjuicer/sj-metadata-cdtext.c |  222 ----------------------------------------
 libjuicer/sj-metadata-cdtext.h |   57 ----------
 libjuicer/sj-metadata-getter.c |    6 -
 5 files changed, 0 insertions(+), 300 deletions(-)
---
diff --git a/configure.in b/configure.in
index f1d3b90..2b5b4aa 100644
--- a/configure.in
+++ b/configure.in
@@ -75,15 +75,6 @@ PKG_CHECK_MODULES(MEDIA_PROFILES, gnome-media-profiles >= 2.11.91)
 AC_SUBST(MEDIA_PROFILES_CFLAGS)
 AC_SUBST(MEDIA_PROFILES_LIBS)
 
-# Find optional libcdio
-PKG_CHECK_MODULES([CDIO],[libcdio >= 0.70], [have_cdio=yes], [have_cdio=no])
-AC_SUBST([CDIO_CFLAGS])
-AC_SUBST([CDIO_LIBS])
-AM_CONDITIONAL([HAVE_LIBCDIO], [test "$have_cdio" = "yes"])
-if test "$have_cdio" = "yes" ; then
-	AC_DEFINE([HAVE_LIBCDIO], 1, [Whether libcdio is available])
-fi
-
 # Find optional MusicBrainz3 and required Musicbrainz2
 PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3 >= 3.0.2, [have_mb3=yes], [have_mb3=no])
 AC_SUBST(MUSICBRAINZ3_CFLAGS)
diff --git a/libjuicer/Makefile.am b/libjuicer/Makefile.am
index dfeda43..0db4007 100644
--- a/libjuicer/Makefile.am
+++ b/libjuicer/Makefile.am
@@ -56,12 +56,6 @@ libjuicer_la_SOURCES += \
 	sj-metadata-musicbrainz3.c
 endif
 
-if HAVE_LIBCDIO
-libjuicer_la_SOURCES += \
-	sj-metadata-cdtext.h \
-	sj-metadata-cdtext.c
-endif
-
 #
 # Build the GValue marshals
 #
diff --git a/libjuicer/sj-metadata-getter.c b/libjuicer/sj-metadata-getter.c
index da3f685..2d3ec88 100644
--- a/libjuicer/sj-metadata-getter.c
+++ b/libjuicer/sj-metadata-getter.c
@@ -32,9 +32,6 @@
 #ifdef HAVE_MUSICBRAINZ
 #include "sj-metadata-musicbrainz.h"
 #endif /* HAVE_MUSICBRAINZ */
-#ifdef HAVE_LIBCDIO
-#include "sj-metadata-cdtext.h"
-#endif /* HAVE_LIBCDIO */
 #include "sj-metadata-gvfs.h"
 #include "sj-error.h"
 
@@ -184,9 +181,6 @@ lookup_cd (SjMetadataGetter *mdg)
 #ifdef HAVE_MUSICBRAINZ
     SJ_TYPE_METADATA_MUSICBRAINZ,
 #endif /* HAVE_MUSICBRAINZ */
-#ifdef HAVE_LIBCDIO
-    SJ_TYPE_METADATA_CDTEXT,
-#endif /* HAVE_LIBCDIO */
     SJ_TYPE_METADATA_GVFS
   };
 



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]