diff options
| author | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-12-30 00:22:38 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim.muller@collabora.co.uk> | 2010-12-31 00:51:12 +0000 |
| commit | 8bdcb84abd3f2d2918c29aa106be487e0d84ec6b (patch) | |
| tree | d54317da9cef3982acd4994e2ba13f71617da0cb | |
| parent | ad628d0bc576c5a55f9e7d1e91fa02ccca8a7a85 (diff) | |
elements: add new valve element to build
Moved from gst-plugins-bad
https://bugzilla.gnome.org/show_bug.cgi?id=630808
| -rw-r--r-- | plugins/elements/Makefile.am | 6 | ||||
| -rw-r--r-- | plugins/elements/gstelements.c | 4 | ||||
| -rw-r--r-- | plugins/elements/gstvalve.c | 14 |
3 files changed, 7 insertions, 17 deletions
diff --git a/plugins/elements/Makefile.am b/plugins/elements/Makefile.am index 8019041599..39f4274f21 100644 --- a/plugins/elements/Makefile.am +++ b/plugins/elements/Makefile.am @@ -12,11 +12,12 @@ libgstcoreelements_la_SOURCES = \ gstfilesink.c \ gstfilesrc.c \ gstidentity.c \ + gstmultiqueue.c \ gstqueue.c \ gstqueue2.c \ gsttee.c \ gsttypefindelement.c \ - gstmultiqueue.c + gstvalve.c libgstcoreelements_la_CFLAGS = $(GST_OBJ_CFLAGS) libgstcoreelements_la_LIBADD = \ @@ -34,11 +35,12 @@ noinst_HEADERS = \ gstfilesink.h \ gstfilesrc.h \ gstidentity.h \ + gstmultiqueue.h \ gstqueue.h \ gstqueue2.h \ gsttee.h \ gsttypefindelement.h \ - gstmultiqueue.h + gstvalve.h EXTRA_DIST = gstfdsrc.c \ gstfdsink.c diff --git a/plugins/elements/gstelements.c b/plugins/elements/gstelements.c index 8380483a3a..883d790c09 100644 --- a/plugins/elements/gstelements.c +++ b/plugins/elements/gstelements.c @@ -35,11 +35,12 @@ #include "gstfilesink.h" #include "gstfilesrc.h" #include "gstidentity.h" +#include "gstmultiqueue.h" #include "gstqueue.h" #include "gstqueue2.h" #include "gsttee.h" #include "gsttypefindelement.h" -#include "gstmultiqueue.h" +#include "gstvalve.h" struct _elements_entry { @@ -65,6 +66,7 @@ static struct _elements_entry _elements[] = { {"tee", GST_RANK_NONE, gst_tee_get_type}, {"typefind", GST_RANK_NONE, gst_type_find_element_get_type}, {"multiqueue", GST_RANK_NONE, gst_multi_queue_get_type}, + {"valve", GST_RANK_NONE, gst_valve_get_type}, {NULL, 0}, }; diff --git a/plugins/elements/gstvalve.c b/plugins/elements/gstvalve.c index 977a4afa02..fd70cf398e 100644 --- a/plugins/elements/gstvalve.c +++ b/plugins/elements/gstvalve.c @@ -268,17 +268,3 @@ gst_valve_getcaps (GstPad * pad) return caps; } - - -static gboolean -plugin_init (GstPlugin * plugin) -{ - return gst_element_register (plugin, "valve", - GST_RANK_MARGINAL, GST_TYPE_VALVE); -} - -GST_PLUGIN_DEFINE (GST_VERSION_MAJOR, - GST_VERSION_MINOR, - "valve", - "Valve", - plugin_init, VERSION, GST_LICENSE, GST_PACKAGE_NAME, GST_PACKAGE_ORIGIN) |