[rhythmbox] audiocd: remove libmusicbrainz2 code (bug #650848)

[Jonathan Matthew <jmatthew src gnome org>]

commit 1c2f40b58954be25d0ea31d008a6763997f96307
Author: Jonathan Matthew <jonathan d14n org>
Date:   Mon May 23 21:23:51 2011 +1000

    audiocd: remove libmusicbrainz2 code (bug #650848)

 configure.ac                              |   19 +-
 plugins/audiocd/Makefile.am               |    9 -
 plugins/audiocd/sj-metadata-getter.c      |    6 -
 plugins/audiocd/sj-metadata-musicbrainz.c |  616 -----------------------------
 plugins/audiocd/sj-metadata-musicbrainz.h |   57 ---
 5 files changed, 2 insertions(+), 705 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 5a82ab4..3065970 100644
--- a/configure.ac
+++ b/configure.ac
@@ -50,7 +50,6 @@ GST_0_10_REQS=0.10.20
 GDK_PIXBUF_REQS=2.18.0
 GLIB_REQS=2.26.0
 LIBGPOD_REQS=0.6
-MUSICBRAINZ_REQS=2.1.0
 MUSICBRAINZ3_REQS=3.0.2
 TOTEM_PLPARSER_REQS=2.32.1
 VALA_REQS=0.9.4
@@ -354,12 +353,9 @@ AC_ARG_ENABLE(musicbrainz, AC_HELP_STRING([--disable-musicbrainz],
 				[don't build with MusicBrainz support]))
 if test x"$enable_musicbrainz" != "xno"; then
 	PKG_CHECK_MODULES(MUSICBRAINZ3, libmusicbrainz3 >= $MUSICBRAINZ3_REQS, [have_musicbrainz3=yes], [have_musicbrainz3=no])
-	PKG_CHECK_MODULES(MUSICBRAINZ, libmusicbrainz >= $MUSICBRAINZ_REQS, [have_musicbrainz=yes], [have_musicbrainz=no])
 
 	AC_SUBST(MUSICBRAINZ3_CFLAGS)
 	AC_SUBST(MUSICBRAINZ3_LIBS)
-	AC_SUBST(MUSICBRAINZ_CFLAGS)
-	AC_SUBST(MUSICBRAINZ_LIBS)
 
 	if test x"$have_musicbrainz3" = xyes; then
 		oldlibs=$LIBS
@@ -368,12 +364,6 @@ if test x"$enable_musicbrainz" != "xno"; then
 		LIBS="$oldlibs"
 
 		AC_DEFINE([HAVE_MUSICBRAINZ3], 1, [Whether libmusicbrainz3 is available])
-	fi
-	if test x"$have_musicbrainz" = xyes; then
-		AC_DEFINE([HAVE_MUSICBRAINZ], 1, [define if you have Musicbrainz])
-	fi
-
-	if test x"$have_musicbrainz3" = "xyes" || test x"$have_musicbrainz" = "xyes"; then
 		have_sj_metadata_getter=yes
 		AC_DEFINE([HAVE_SJ_METADATA_GETTER], 1, [Whether to use the sound-juicer metadata getter code])
 	else
@@ -382,7 +372,6 @@ if test x"$enable_musicbrainz" != "xno"; then
 		fi
 	fi
 fi
-AM_CONDITIONAL([HAVE_MUSICBRAINZ], [test "x$have_musicbrainz" = "xyes"])
 AM_CONDITIONAL([HAVE_MUSICBRAINZ3], [test "x$have_musicbrainz3" = "xyes"])
 AM_CONDITIONAL([HAVE_SJ_METADATA_GETTER], [test "x$have_sj_metadata_getter" = "xyes"])
 
@@ -879,12 +868,8 @@ else
 	AC_MSG_NOTICE([** Multimedia keys support is enabled])
 fi
 
-if test x"$have_musicbrainz3" = "xyes" && test x"$have_musicbrainz" = "xyes"; then
-	AC_MSG_NOTICE([** MusicBrainz support is enabled (using libmusicbrainz3 and libmusicbrainz)])
-elif test x"$have_musicbrainz3" = "xyes"; then
-	AC_MSG_NOTICE([** MusicBrainz support is enabled (using libmusicbrainz3)])
-elif test x"$have_musicbrainz" = "xyes"; then
-	AC_MSG_NOTICE([** MusicBrainz support is enabled (using libmusicbrainz)])
+if test x"$have_musicbrainz3" = "xyes"; then
+	AC_MSG_NOTICE([** MusicBrainz support is enabled])
 else
 	AC_MSG_NOTICE([   MusicBrainz support is disabled])
 fi
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index ea3d1c4..f0a1609 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -42,10 +42,6 @@ INCLUDES = 						\
 	-DUSE_TOTEM_PL_PARSER				\
 	-D_XOPEN_SOURCE -D_BSD_SOURCE
 
-if HAVE_MUSICBRAINZ
-libaudiocd_la_LIBADD += $(MUSICBRAINZ_LIBS)
-INCLUDES += $(MUSICBRAINZ_CFLAGS)
-endif
 if HAVE_MUSICBRAINZ3
 libaudiocd_la_LIBADD +=$(MUSICBRAINZ3_LIBS)
 INCLUDES += $(MUSICBRAINZ3_CFLAGS)
@@ -76,7 +72,6 @@ SJ_FILES =									\
 	sj-metadata-gvfs.c sj-metadata-gvfs.h					\
 	sj-metadata-getter.c sj-metadata-getter.h				\
 	sj-metadata-musicbrainz3.c sj-metadata-musicbrainz3.h			\
-	sj-metadata-musicbrainz.c sj-metadata-musicbrainz.h			\
 	sj-structures.c sj-structures.h						\
 	sj-metadata-marshal.list
 
@@ -95,10 +90,6 @@ libaudiocd_la_SOURCES +=							\
 	sj-error.h sj-error.c							\
 	$(MARSHALFILES)
 
-if HAVE_MUSICBRAINZ
-libaudiocd_la_SOURCES += sj-metadata-musicbrainz.c sj-metadata-musicbrainz.h
-endif
-
 if HAVE_MUSICBRAINZ3
 libaudiocd_la_SOURCES += sj-metadata-musicbrainz3.c sj-metadata-musicbrainz3.h
 endif
diff --git a/plugins/audiocd/sj-metadata-getter.c b/plugins/audiocd/sj-metadata-getter.c
index da3f685..191796f 100644
--- a/plugins/audiocd/sj-metadata-getter.c
+++ b/plugins/audiocd/sj-metadata-getter.c
@@ -29,9 +29,6 @@
 #ifdef HAVE_MUSICBRAINZ3
 #include "sj-metadata-musicbrainz3.h"
 #endif /* HAVE_MUSICBRAINZ3 */
-#ifdef HAVE_MUSICBRAINZ
-#include "sj-metadata-musicbrainz.h"
-#endif /* HAVE_MUSICBRAINZ */
 #ifdef HAVE_LIBCDIO
 #include "sj-metadata-cdtext.h"
 #endif /* HAVE_LIBCDIO */
@@ -181,9 +178,6 @@ lookup_cd (SjMetadataGetter *mdg)
 #ifdef HAVE_MUSICBRAINZ3
     SJ_TYPE_METADATA_MUSICBRAINZ3,
 #endif /* HAVE_MUSICBRAINZ3 */
-#ifdef HAVE_MUSICBRAINZ
-    SJ_TYPE_METADATA_MUSICBRAINZ,
-#endif /* HAVE_MUSICBRAINZ */
 #ifdef HAVE_LIBCDIO
     SJ_TYPE_METADATA_CDTEXT,
 #endif /* HAVE_LIBCDIO */