summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-11-02 21:33:32 +0000
committerRonald S. Bultje <rbultje@ronald.bitfreak.net>2003-11-02 21:33:32 +0000
commitc19bddc886f6ae203f4139f9b316ec04d054496b (patch)
treea883e0871e306daa3306df9c0e9b6d2fbb1e80a3
parentfb9500ea5ed3434d8b87af449657f90e42b1041f (diff)
downloadgst-plugins-bad-c19bddc886f6ae203f4139f9b316ec04d054496b.tar.gz
gst-plugins-bad-c19bddc886f6ae203f4139f9b316ec04d054496b.tar.bz2
gst-plugins-bad-c19bddc886f6ae203f4139f9b316ec04d054496b.zip
Last o plugin
Original commit message from CVS: Last o plugin
-rw-r--r--gst/overlay/gstoverlay.c59
1 files changed, 31 insertions, 28 deletions
diff --git a/gst/overlay/gstoverlay.c b/gst/overlay/gstoverlay.c
index 5b141657..a2d799ec 100644
--- a/gst/overlay/gstoverlay.c
+++ b/gst/overlay/gstoverlay.c
@@ -27,11 +27,8 @@
static GstElementDetails overlay_details = {
"Video Overlay",
"Filter/Video",
- "LGPL",
"Overlay multiple video streams",
- VERSION,
- "David Schleef <ds@schleef.org>",
- "(C) 2002, 2003",
+ "David Schleef <ds@schleef.org>"
};
GST_PAD_TEMPLATE_FACTORY (overlay_src_factory,
@@ -102,6 +99,7 @@ enum {
static void gst_overlay_class_init (GstOverlayClass *klass);
+static void gst_overlay_base_init (GstOverlayClass *klass);
static void gst_overlay_init (GstOverlay *overlay);
static void gst_overlay_loop (GstElement *element);
@@ -122,7 +120,7 @@ gst_overlay_get_type (void)
if (!overlay_type) {
static const GTypeInfo overlay_info = {
sizeof(GstOverlayClass),
- NULL,
+ (GBaseInitFunc)gst_overlay_base_init,
NULL,
(GClassInitFunc)gst_overlay_class_init,
NULL,
@@ -137,6 +135,22 @@ gst_overlay_get_type (void)
}
static void
+gst_overlay_base_init (GstOverlayClass *klass)
+{
+ GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+ gst_element_class_add_pad_template (element_class,
+ GST_PAD_TEMPLATE_GET (overlay_sink1_factory));
+ gst_element_class_add_pad_template (element_class,
+ GST_PAD_TEMPLATE_GET (overlay_sink2_factory));
+ gst_element_class_add_pad_template (element_class,
+ GST_PAD_TEMPLATE_GET (overlay_sink3_factory));
+ gst_element_class_add_pad_template (element_class,
+ GST_PAD_TEMPLATE_GET (overlay_src_factory));
+ gst_element_class_set_details (element_class, &overlay_details);
+}
+
+static void
gst_overlay_class_init (GstOverlayClass *klass)
{
GObjectClass *gobject_class;
@@ -368,32 +382,21 @@ gst_overlay_get_property (GObject *object, guint prop_id,
static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
{
- GstElementFactory *factory;
-
- factory = gst_element_factory_new("overlay",GST_TYPE_OVERLAY,
- &overlay_details);
- g_return_val_if_fail(factory != NULL, FALSE);
-
- gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (overlay_sink1_factory));
- gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (overlay_sink2_factory));
- gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (overlay_sink3_factory));
- gst_element_factory_add_pad_template (factory,
- GST_PAD_TEMPLATE_GET (overlay_src_factory));
-
- gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
-
- return TRUE;
+ return gst_element_register (plugin, "overlay",
+ GST_RANK_NONE, GST_TYPE_OVERLAY);
}
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR,
GST_VERSION_MINOR,
"overlay",
- plugin_init
-};
-
+ "Overlay multiple video streams",
+ plugin_init,
+ VERSION,
+ "LGPL",
+ GST_COPYRIGHT,
+ GST_PACKAGE,
+ GST_ORIGIN
+)