From: Ronald S. Bultje <rbultje@ronald.bitfreak.net>
Date: Sun, 2 Nov 2003 22:20:19 +0000 (+0000)
Subject: and even sine sources can be generated again
X-Git-Tag: CAPS-ROOT~136
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e5f82e4cb90ebf670a1dbd2271f915e850f8e18b;p=platform%2Fupstream%2Fgst-plugins-base.git

and even sine sources can be generated again

Original commit message from CVS:
and even sine sources can be generated again
---

diff --git a/gst/sine/gstsinesrc.c b/gst/sine/gstsinesrc.c
index 076812b..2bb0743 100644
--- a/gst/sine/gstsinesrc.c
+++ b/gst/sine/gstsinesrc.c
@@ -35,11 +35,8 @@
 GstElementDetails gst_sinesrc_details = {
   "Sine-wave src",
   "Source/Audio",
-  "LGPL",
   "Create a sine wave of a given frequency and volume",
-  VERSION,
-  "Erik Walthinsen <omega@cse.ogi.edu>",
-  "(C) 1999",
+  "Erik Walthinsen <omega@cse.ogi.edu>"
 };
 
 
@@ -76,6 +73,7 @@ GST_PAD_TEMPLATE_FACTORY (sinesrc_src_factory,
 );
 
 static void 	    gst_sinesrc_class_init          (GstSineSrcClass *klass);
+static void 	    gst_sinesrc_base_init           (GstSineSrcClass *klass);
 static void 	    gst_sinesrc_init	            (GstSineSrc *src);
 static void 	    gst_sinesrc_set_property        (GObject *object, 
 		                                     guint prop_id, 
@@ -108,7 +106,8 @@ gst_sinesrc_get_type (void)
 
   if (!sinesrc_type) {
     static const GTypeInfo sinesrc_info = {
-      sizeof (GstSineSrcClass), NULL, NULL,
+      sizeof (GstSineSrcClass),
+      (GBaseInitFunc) gst_sinesrc_base_init, NULL,
       (GClassInitFunc) gst_sinesrc_class_init, NULL, NULL,
       sizeof (GstSineSrc), 0,
       (GInstanceInitFunc) gst_sinesrc_init,
@@ -120,6 +119,16 @@ gst_sinesrc_get_type (void)
 }
 
 static void
+gst_sinesrc_base_init (GstSineSrcClass *klass)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (klass);
+
+  gst_element_class_add_pad_template (element_class, 
+		GST_PAD_TEMPLATE_GET (sinesrc_src_factory));
+  gst_element_class_set_details (element_class, &gst_sinesrc_details);
+}
+
+static void
 gst_sinesrc_class_init (GstSineSrcClass *klass) 
 {
   GObjectClass *gobject_class;
@@ -441,28 +450,24 @@ gst_sinesrc_force_caps (GstSineSrc *src) {
 }
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
-  GstElementFactory *factory;
-
-  factory = gst_element_factory_new ("sinesrc", GST_TYPE_SINESRC,
-                                     &gst_sinesrc_details);
-  g_return_val_if_fail (factory != NULL, FALSE);
-  
-  gst_element_factory_add_pad_template (factory, 
-		              GST_PAD_TEMPLATE_GET (sinesrc_src_factory));
-
-  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
-  
   /* initialize dparam support library */
   gst_control_init(NULL,NULL);
-  
-  return TRUE;
+
+  return gst_element_register (plugin, "sinesrc",
+			       GST_RANK_NONE, GST_TYPE_SINESRC);
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
-  "sinesrc",
-  plugin_init
-};
+  "sine",
+  "Sine audio wave generator",
+  plugin_init,
+  VERSION,
+  "LGPL",
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN
+)