diff options
author | Benjamin Otte <otte@gnome.org> | 2003-10-28 20:52:41 +0000 |
---|---|---|
committer | Benjamin Otte <otte@gnome.org> | 2003-10-28 20:52:41 +0000 |
commit | 5bb80c9f5359a446d52ad7824095ae4c67bf3cdf (patch) | |
tree | 389f062ecc5627e362c48b89fda7257d10fa8d8c /ext | |
parent | 680f08e33306ff907e31b3c9db70e132fc9a5158 (diff) | |
download | gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.tar.gz gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.tar.bz2 gst-plugins-bad-5bb80c9f5359a446d52ad7824095ae4c67bf3cdf.zip |
merge TYPEFIND branch. Major changes:
Original commit message from CVS:
merge TYPEFIND branch. Major changes:
- totally reworked type(find) system
- all typefind functions are in gst/typefind now
- more typefind functions then before
- some plugins might fail to compile now because I don't have them installed and they
a) require bytestream or
b) haven't had their typefind fixed.
Please fix those plugins and put the typefind functions into gst/typefind if they don't have dependencies
Diffstat (limited to 'ext')
-rw-r--r-- | ext/audiofile/gstaf.c | 3 | ||||
-rw-r--r-- | ext/audiofile/gstafparse.h | 2 | ||||
-rw-r--r-- | ext/ivorbis/vorbis.c | 5 | ||||
-rw-r--r-- | ext/ivorbis/vorbisfile.c | 2 | ||||
-rw-r--r-- | ext/jack/gstjack.h | 2 | ||||
-rw-r--r-- | ext/ladspa/gstladspa.h | 2 | ||||
-rw-r--r-- | ext/mplex/gstmplex.cc | 4 | ||||
-rw-r--r-- | ext/mplex/gstmplex.h | 2 | ||||
-rw-r--r-- | ext/swfdec/gstswfdec.c | 27 |
9 files changed, 14 insertions, 35 deletions
diff --git a/ext/audiofile/gstaf.c b/ext/audiofile/gstaf.c index 4e2b3e9a..cec38f1e 100644 --- a/ext/audiofile/gstaf.c +++ b/ext/audiofile/gstaf.c @@ -25,6 +25,9 @@ static gboolean plugin_init (GModule *module, GstPlugin *plugin) { + if (!gst_library_load ("gstbytestream")) + return FALSE; + gst_afsink_plugin_init (module, plugin); gst_afsrc_plugin_init (module, plugin); gst_afparse_plugin_init (module, plugin); diff --git a/ext/audiofile/gstafparse.h b/ext/audiofile/gstafparse.h index 1cf7b1e1..51877bae 100644 --- a/ext/audiofile/gstafparse.h +++ b/ext/audiofile/gstafparse.h @@ -27,7 +27,7 @@ #include <config.h> #include <gst/gst.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> #include <audiofile.h> /* what else are we to do */ #include <af_vfs.h> diff --git a/ext/ivorbis/vorbis.c b/ext/ivorbis/vorbis.c index 35919059..9b12611c 100644 --- a/ext/ivorbis/vorbis.c +++ b/ext/ivorbis/vorbis.c @@ -21,7 +21,7 @@ #include <gst/gst.h> #include <tremor/ivorbiscodec.h> #include <tremor/ivorbisfile.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> extern GType ivorbisfile_get_type(void); @@ -104,6 +104,9 @@ plugin_init (GModule *module, GstPlugin *plugin) GstTypeFactory *type; GstCaps *raw_caps, *vorbis_caps, *raw_caps2; + if (!gst_library_load ("gstbytestream")) + return FALSE; + gst_plugin_set_longname (plugin, "The OGG Vorbis Codec"); raw_caps = raw_caps_factory (); diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c index fa9f8ef3..ef76a0cc 100644 --- a/ext/ivorbis/vorbisfile.c +++ b/ext/ivorbis/vorbisfile.c @@ -24,7 +24,7 @@ #include <gst/gst.h> #include <tremor/ivorbiscodec.h> #include <tremor/ivorbisfile.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> #define GST_TYPE_IVORBISFILE \ (ivorbisfile_get_type()) diff --git a/ext/jack/gstjack.h b/ext/jack/gstjack.h index 80fd2b63..2bb13858 100644 --- a/ext/jack/gstjack.h +++ b/ext/jack/gstjack.h @@ -22,7 +22,7 @@ #include <jack/jack.h> #include <gst/gst.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> //#define JACK_DEBUG(str, a...) g_message (str, ##a) #define JACK_DEBUG(str, a...) diff --git a/ext/ladspa/gstladspa.h b/ext/ladspa/gstladspa.h index 85348a95..a33062ff 100644 --- a/ext/ladspa/gstladspa.h +++ b/ext/ladspa/gstladspa.h @@ -26,7 +26,7 @@ #include <config.h> #include <gst/gst.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> #include "ladspa.h" diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 523cc74f..8f8a94a3 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -578,8 +578,8 @@ plugin_init (GModule *module, GstPlugin *plugin) GstElementFactory *factory; /* this filter needs the bytestream package */ -/* if (!gst_library_load ("gstbytestream")) - return FALSE;*/ + if (!gst_library_load ("gstbytestream")) + return FALSE; /* create an elementfactory for the avi_demux element */ factory = gst_element_factory_new ("mplex",GST_TYPE_MPLEX, diff --git a/ext/mplex/gstmplex.h b/ext/mplex/gstmplex.h index 8b108ed1..2af37379 100644 --- a/ext/mplex/gstmplex.h +++ b/ext/mplex/gstmplex.h @@ -26,7 +26,7 @@ #include <stdlib.h> #include <gst/gst.h> -#include <gst/gstbytestream.h> +#include <gst/bytestream.h> #include "outputstream.hh" #include "bits.hh" diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c index 58e96e87..78ed29b4 100644 --- a/ext/swfdec/gstswfdec.c +++ b/ext/swfdec/gstswfdec.c @@ -626,34 +626,10 @@ gst_swfdec_get_property (GObject *object, guint prop_id, GValue *value, GParamSp } } -static GstCaps * -swf_type_find(GstByteStream *bs, gpointer private) -{ - GstBuffer *buf; - gchar *data; - - gst_bytestream_peek (bs, &buf, 4); - data = GST_BUFFER_DATA(buf); - - if (GST_BUFFER_SIZE (buf) < 4) - return NULL; - - if((data[0] != 'F' && data[0] != 'C') || - data[1] != 'W' || data[2] != 'S')return NULL; - - return gst_caps_new("swf_type_find","application/x-shockwave-flash", - NULL); -} - -static GstTypeDefinition swftype_definition = - { "swfdecode/x-shockwave-flash", "application/x-shockwave-flash", - ".swf .swfl", swf_type_find }; - static gboolean plugin_init (GModule *module, GstPlugin *plugin) { GstElementFactory *factory; - GstTypeFactory *type; /* create an elementfactory for the swfdec element */ factory = gst_element_factory_new("swfdec",GST_TYPE_SWFDEC, @@ -670,9 +646,6 @@ plugin_init (GModule *module, GstPlugin *plugin) gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); - type = gst_type_factory_new(&swftype_definition); - gst_plugin_add_feature(plugin, GST_PLUGIN_FEATURE(type)); - return TRUE; } |