Updated for the new plugin loading code

Original commit message from CVS:
Updated for the new plugin loading code

diff --git a/ext/raw1394/gst1394.c b/ext/raw1394/gst1394.c
index 3ed0f59..f8ed514 100644 (file)
--- 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 <omega@temple-baptist.com>\n"
-  "Daniel Fischer <dan@f3c.com>",
-  "(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 0933e30..707fde6 100644 (file)
--- 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 <omega@temple-baptist.com>\n"
+  "Daniel Fischer <dan@f3c.com>",
+};
+
 #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,
@@ -103,6 +113,14 @@ gst_dv1394src_get_type(void) {
 }
 
 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)
 {
   GObjectClass *gobject_class;