From 4ffbacc2f2671d4b92849c9ecaa81aa5545e3496 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Sun, 2 Nov 2003 03:08:13 +0000 Subject: [PATCH] Updated for the new plugin loading code Original commit message from CVS: Updated for the new plugin loading code --- ext/raw1394/gst1394.c | 36 ++++++++++++------------------------ ext/raw1394/gstdv1394src.c | 20 +++++++++++++++++++- 2 files changed, 31 insertions(+), 25 deletions(-) diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c index 3ed0f59f5..f8ed5148e 100644 --- a/ext/raw1394/gst1394.c +++ b/ext/raw1394/gst1394.c @@ -26,37 +26,25 @@ #include "gstdv1394src.h" -/* elementfactory information */ -static GstElementDetails gst_dv1394src_details = { - "Firewire (1394) DV Source", - "Source/Video", - "LGPL", - "Source for DV video data from firewire port", - VERSION, - "Erik Walthinsen \n" - "Daniel Fischer ", - "(C) 2001-2002", -}; - - static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +plugin_init (GstPlugin *plugin) { - GstElementFactory *factory; - - factory = gst_element_factory_new("dv1394src",GST_TYPE_DV1394SRC, - &gst_dv1394src_details); - g_return_val_if_fail(factory != NULL, FALSE); - - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); + if (!gst_element_register(plugin, "dv1394src", GST_RANK_NONE, GST_TYPE_DV1394SRC)) + return FALSE; return TRUE; } -GstPluginDesc plugin_desc = { +GST_PLUGIN_DEFINE( GST_VERSION_MAJOR, GST_VERSION_MINOR, "gst1394", - plugin_init -}; + "Source for DV data via IEEE1394 interface", + plugin_init, + VERSION, + "LGPL", + GST_COPYRIGHT, + GST_PACKAGE, + GST_ORIGIN +); diff --git a/ext/raw1394/gstdv1394src.c b/ext/raw1394/gstdv1394src.c index 0933e305b..707fde6d6 100644 --- a/ext/raw1394/gstdv1394src.c +++ b/ext/raw1394/gstdv1394src.c @@ -40,6 +40,14 @@ enum { ARG_DROP_INCOMPLETE, }; +static GstElementDetails gst_dv1394src_details = { + "Firewire (1394) DV Source", + "Source/Video", + "Source for DV video data from firewire port", + "Erik Walthinsen \n" + "Daniel Fischer ", +}; + #if 0 static GstPadTemplate* gst_dv1394src_factory (void) @@ -69,6 +77,7 @@ gst_dv1394src_factory (void) } #endif +static void gst_dv1394src_base_init (gpointer g_class); static void gst_dv1394src_class_init (GstDV1394SrcClass *klass); static void gst_dv1394src_init (GstDV1394Src *filter); @@ -88,7 +97,8 @@ gst_dv1394src_get_type(void) { if (!gst_dv1394src_type) { static const GTypeInfo gst_dv1394src_info = { - sizeof(GstDV1394Src), NULL, + sizeof(GstDV1394Src), + gst_dv1394src_base_init, NULL, (GClassInitFunc)gst_dv1394src_class_init, NULL, @@ -102,6 +112,14 @@ gst_dv1394src_get_type(void) { return gst_dv1394src_type; } +static void +gst_dv1394src_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details (element_class, &gst_dv1394src_details); +} + static void gst_dv1394src_class_init (GstDV1394SrcClass *klass) { -- 2.34.1