Added the mad mp3 decoder.

Original commit message from CVS:
Added the mad mp3 decoder.
Added flushing to the vorbis decoder.
Updated configure.in to check for Hermes and libmad

diff --git a/acconfig.h b/acconfig.h
index c8d3145f102c4eb264c49265a64fa08e6b28a05f..f2b788d3615d836a8fb7fb0fb1b40d934d861bf1 100644 (file)
--- a/acconfig.h
+++ b/acconfig.h
@@ -29,7 +29,9 @@
 #undef HAVE_XAUDIO
 #undef HAVE_CSSAUTH
 #undef HAVE_VORBIS
+#undef HAVE_LIBMAD
 #undef HAVE_LIBJPEG
+#undef HAVE_LIBHERMES
 #undef HAVE_NASM
 #undef HAVE_MPEG2DEC
 #undef HAVE_LINUX_CDROM

diff --git a/configure.in b/configure.in
index c4aacd8f5bf04ed4fc95d4f3988d94e42627913e..85d5c47356bf33e38147ea6482ec0f62bce932a3 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -377,6 +377,13 @@ AC_CHECK_HEADER(xaudio/decoder.h,
   HAVE_XAUDIO="yes", []
 )
 
+dnl Check for libvorbis
+AC_MSG_CHECKING(MAD library)
+AC_CHECK_LIB(mad, mad_decoder_finish, 
+HAVE_LIBMAD=yes 
+AC_DEFINE(HAVE_LIBMAD),
+HAVE_LIBMAD=no, )
+
 dnl Check for libvorbis
 AC_MSG_CHECKING(Vorbis library)
 AC_CHECK_LIB(vorbis, ogg_sync_init, 
@@ -391,6 +398,12 @@ HAVE_LIBJPEG=yes
 AC_DEFINE(HAVE_LIBJPEG),
 HAVE_LIBJPEG=no, )
 
+dnl Check for libvorbis
+AC_MSG_CHECKING(Hermes library)
+AC_CHECK_LIB(Hermes, Hermes_ConverterInstance, 
+HAVE_LIBHERMES=yes 
+AC_DEFINE(HAVE_LIBHERMES),
+HAVE_LIBHERMES=no, )
 
 dnl Check for cdparanoia
 AC_MSG_CHECKING(CDparanoia library)
@@ -654,11 +667,13 @@ AM_CONDITIONAL(HAVE_LIBMMX,         test "x$USE_LIBMMX" = "xyes")
 AM_CONDITIONAL(HAVE_ATOMIC_H,       test "x$USE_ATOMIC_H" = "xyes")
 AM_CONDITIONAL(HAVE_OSS,            test "x$HAVE_OSS" = "xyes")
 AM_CONDITIONAL(HAVE_XAUDIO,         test "x$HAVE_XAUDIO" = "xyes")
+AM_CONDITIONAL(HAVE_LIBMAD,         test "x$HAVE_LIBMAD" = "xyes")
 AM_CONDITIONAL(HAVE_LINUX_CDROM,    test "x$HAVE_LINUX_CDROM" = "xyes")
 AM_CONDITIONAL(HAVE_LINUX_VIDEODEV, test "x$HAVE_LINUX_VIDEODEV" = "xyes")
 AM_CONDITIONAL(HAVE_CSSAUTH,        test "x$HAVE_CSSAUTH" = "xyes")
 AM_CONDITIONAL(HAVE_VORBIS,         test "x$HAVE_VORBIS" = "xyes")
 AM_CONDITIONAL(HAVE_LIBJPEG,        test "x$HAVE_LIBJPEG" = "xyes")
+AM_CONDITIONAL(HAVE_LIBHERMES,      test "x$HAVE_LIBHERMES" = "xyes")
 AM_CONDITIONAL(HAVE_NASM,           test "x$HAVE_NASM" = "xyes")
 AM_CONDITIONAL(HAVE_LIBGLADE_GNOME, test "x$HAVE_LIBGLADE_GNOME" = "xyes")
 AM_CONDITIONAL(HAVE_GNOME,          test "x$HAVE_GNOME" = "xyes")
@@ -784,6 +799,7 @@ plugins/mp3decode/Makefile
 plugins/mp3decode/types/Makefile
 plugins/mp3decode/xa/Makefile
 plugins/mp3decode/mpg123/Makefile
+plugins/mp3decode/mad/Makefile
 plugins/mp3decode/parse/Makefile
 plugins/mp3encode/Makefile
 plugins/mp3encode/lame/Makefile

diff --git a/test/xmmstest.c b/test/xmmstest.c
index eaeff2d58be46ef351ce1c658c1e27a685f9f285..59eb23d0ac78b3298ce26e303443e3f4a564c4ec 100644 (file)
--- a/test/xmmstest.c
+++ b/test/xmmstest.c
@@ -18,9 +18,9 @@ main (int argc,char *argv[])
 
   bin = gst_bin_new("bin");
 
-  //src = gst_elementfactory_make("XMMS_INPUT_mpeg_layer_1/2/3_player_1.2.4", "xmms_plugin");
+  src = gst_elementfactory_make("XMMS_INPUT_mpeg_layer_1/2/3_player_1.2.4", "xmms_plugin");
   //src = gst_elementfactory_make("XMMS_INPUT_oggvorbis_player_0.1", "xmms_plugin");
-  src = gst_elementfactory_make("XMMS_INPUT_mikmod_player_1.2.4", "xmms_plugin");
+  //src = gst_elementfactory_make("XMMS_INPUT_mikmod_player_1.2.4", "xmms_plugin");
   //src = gst_elementfactory_make("XMMS_INPUT_tone_generator_1.2.4", "xmms_plugin");
   g_return_val_if_fail(src != NULL, -1);