From d9e4457faa360b470a5ae418e3444fccd6c0a5de Mon Sep 17 00:00:00 2001 From: "Ronald S. Bultje" Date: Wed, 1 Oct 2003 13:14:50 +0000 Subject: New typefind system: bytestream is now part of the core all plugins have been modified to use this new typefind syste... Original commit message from CVS: New typefind system: * bytestream is now part of the core * all plugins have been modified to use this new typefind system * asf typefinding added * mpeg video stream typefiding removed because it's broken * duplicate typefind entries removed * extra id3 typefinding added, because we've seen 4 types of files (riff/wav, flac, vorbis, mp3) with id3 headers and each of these needs to work. Instead, I've added an id3 element and let it redo typefiding after the id3 header. this needs a hack because spider only typefinds once. We can remove this hack once spider supports multiple typefinds. * with all this, mp3 typefinding is semi-rewritten * id3 typefinding in flac/vorbis is removed, it's no longer needed * fixed spider and gst-typefind to use this, too. * Other general cleanups --- ext/Makefile.am | 5 +++-- ext/audiofile/gstafparse.c | 3 +-- ext/audiofile/gstafparse.h | 2 +- ext/ivorbis/vorbis.c | 6 +----- ext/ivorbis/vorbisfile.c | 2 +- ext/jack/gstjack.h | 2 +- ext/ladspa/gstladspa.c | 3 --- ext/ladspa/gstladspa.h | 2 +- ext/mplex/gstmplex.h | 2 +- 9 files changed, 10 insertions(+), 17 deletions(-) (limited to 'ext') diff --git a/ext/Makefile.am b/ext/Makefile.am index 2b1ab6ec..66346eac 100644 --- a/ext/Makefile.am +++ b/ext/Makefile.am @@ -278,8 +278,9 @@ SUBDIRS=$(A52DEC_DIR) $(AALIB_DIR) $(ALSA_DIR) \ $(ARTS_DIR) $(ARTSC_DIR) $(AUDIOFILE_DIR) \ $(CDPARANOIA_DIR) $(DIVX_DIR) \ $(DVDREAD_DIR) $(DVDNAV_DIR) $(ESD_DIR) $(MAS_DIR) \ - $(FFMPEG_DIR) $(FLAC_DIR) $(GDK_PIXBUF_DIR) $(GNOMEVFS_DIR) $(GSM_DIR) \ - $(HERMES_DIR) $(JACK_DIR) $(JPEG_DIR) \ + $(FFMPEG_DIR) $(FLAC_DIR) $(GDK_PIXBUF_DIR) \ + $(GNOMEVFS_DIR) $(GSM_DIR) $(HERMES_DIR) \ + $(JACK_DIR) $(JPEG_DIR) \ $(LADSPA_DIR) $(LAME_DIR) $(LCS_DIR) \ $(LIBDV_DIR) $(LIBFAME_DIR) $(LIBPNG_DIR) \ $(MAD_DIR) $(MATROSKA_DIR) $(MIKMOD_DIR) \ diff --git a/ext/audiofile/gstafparse.c b/ext/audiofile/gstafparse.c index 255247e8..183f5147 100644 --- a/ext/audiofile/gstafparse.c +++ b/ext/audiofile/gstafparse.c @@ -337,8 +337,7 @@ gst_afparse_plugin_init (GModule *module, GstPlugin *plugin) /* load audio support library */ if (!gst_library_load ("gstaudio")) return FALSE; - if (!gst_library_load ("gstbytestream")) - return FALSE; + return TRUE; } diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h index 9483f248..1cf7b1e1 100644 --- a/ext/audiofile/gstafparse.h +++ b/ext/audiofile/gstafparse.h @@ -27,7 +27,7 @@ #include #include -#include +#include #include /* what else are we to do */ #include diff --git a/ext/ivorbis/vorbis.c b/ext/ivorbis/vorbis.c index 65ef4b06..35919059 100644 --- a/ext/ivorbis/vorbis.c +++ b/ext/ivorbis/vorbis.c @@ -21,7 +21,7 @@ #include #include #include -#include +#include extern GType ivorbisfile_get_type(void); @@ -132,10 +132,6 @@ plugin_init (GModule *module, GstPlugin *plugin) gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (file)); - /* this filter needs the bytestream package */ - if (!gst_library_load ("gstbytestream")) - return FALSE; - type = gst_type_factory_new (&vorbisdefinition); gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (type)); diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c index 86c7baf2..5b270fb9 100644 --- a/ext/ivorbis/vorbisfile.c +++ b/ext/ivorbis/vorbisfile.c @@ -24,7 +24,7 @@ #include #include #include -#include +#include #define GST_TYPE_IVORBISFILE \ (ivorbisfile_get_type()) diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h index 87d7d611..80fd2b63 100644 --- a/ext/jack/gstjack.h +++ b/ext/jack/gstjack.h @@ -22,7 +22,7 @@ #include #include -#include +#include //#define JACK_DEBUG(str, a...) g_message (str, ##a) #define JACK_DEBUG(str, a...) diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 460bdf12..5f16dbf5 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -993,9 +993,6 @@ plugin_init (GModule *module, GstPlugin *plugin) LADSPAPluginSearch(ladspa_describe_plugin); - if (! gst_library_load ("gstbytestream")) - return FALSE; - /* initialize dparam support library */ gst_control_init(NULL,NULL); diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index 89a039e9..85348a95 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "ladspa.h" diff --git a/ext/mplex/gstmplex.h b/ext/mplex/gstmplex.h index 98b19aca..8b108ed1 100644 --- a/ext/mplex/gstmplex.h +++ b/ext/mplex/gstmplex.h @@ -26,7 +26,7 @@ #include #include -#include +#include #include "outputstream.hh" #include "bits.hh" -- cgit v1.2.1