From 4865820a8f7168ebb72a6ab8f6b30a6c714883e0 Mon Sep 17 00:00:00 2001
From: Iain Holmes <iain@prettypeople.org>
Date: Sat, 1 Nov 2003 15:28:33 +0000
Subject: [PATCH] ESD Updated

Original commit message from CVS:
ESD Updated
---
 ext/esd/esdmon.c  | 29 +++++++++++++++--------------
 ext/esd/esdsink.c | 28 ++++++++++++++--------------
 ext/esd/gstesd.c  | 13 +++++++++----
 3 files changed, 38 insertions(+), 32 deletions(-)

diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c
index de7e114..2ddb177 100644
--- a/ext/esd/esdmon.c
+++ b/ext/esd/esdmon.c
@@ -32,11 +32,8 @@
 static GstElementDetails esdmon_details = {
   "Esound audio monitor",
   "Source/Audio",
-  "LGPL",
   "Monitors audio from an esound server",
-  VERSION,
   "Richard Boulton <richard-gst@tartarus.org>",
-  "(C) 2002",
 };
 
 /* Signals and args */
@@ -84,6 +81,7 @@ GST_PAD_TEMPLATE_FACTORY (src_factory,
   )
 );
 
+static void                     gst_esdmon_base_init    (gpointer g_class);
 static void			gst_esdmon_class_init	(GstEsdmonClass *klass);
 static void			gst_esdmon_init		(GstEsdmon *esdmon);
 
@@ -142,7 +140,8 @@ gst_esdmon_get_type (void)
 
   if (!esdmon_type) {
     static const GTypeInfo esdmon_info = {
-      sizeof(GstEsdmonClass),      NULL,
+      sizeof(GstEsdmonClass),
+      gst_esdmon_base_init,
       NULL,
       (GClassInitFunc)gst_esdmon_class_init,
       NULL,
@@ -157,6 +156,15 @@ gst_esdmon_get_type (void)
 }
 
 static void
+gst_esdmon_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class, GST_PAD_TEMPLATE_GET (src_factory));
+  gst_element_class_set_details (element_class, &esdmon_details);
+}
+
+static void
 gst_esdmon_class_init (GstEsdmonClass *klass)
 {
   GObjectClass *gobject_class;
@@ -365,16 +373,9 @@ gst_esdmon_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
 gboolean
 gst_esdmon_factory_init (GstPlugin *plugin)
 {
-  GstElementFactory *factory;
-
-  factory = gst_element_factory_new("esdmon", GST_TYPE_ESDMON,
-				   &esdmon_details);
-  g_return_val_if_fail(factory != NULL, FALSE);
-
-  gst_element_factory_add_pad_template(factory, GST_PAD_TEMPLATE_GET (src_factory));
-
-  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
-
+  if (!gst_element_register (plugin, "esdmon", GST_RANK_NONE, GST_TYPE_ESDMON))
+    return FALSE;
+  
   return TRUE;
 }
 
diff --git a/ext/esd/esdsink.c b/ext/esd/esdsink.c
index 7169b0e..219f732 100644
--- a/ext/esd/esdsink.c
+++ b/ext/esd/esdsink.c
@@ -32,11 +32,8 @@
 static GstElementDetails esdsink_details = {
   "Esound audio sink",
   "Sink/Audio",
-  "LGPL",
   "Plays audio to an esound server",
-  VERSION,
   "Richard Boulton <richard-gst@tartarus.org>",
-  "(C) 2001",
 };
 
 /* Signals and args */
@@ -82,6 +79,7 @@ GST_PAD_TEMPLATE_FACTORY (sink_factory,
   )
 );
 
+static void                     gst_esdsink_base_init           (gpointer g_class);
 static void			gst_esdsink_class_init		(GstEsdsinkClass *klass);
 static void			gst_esdsink_init		(GstEsdsink *esdsink);
 
@@ -110,7 +108,8 @@ gst_esdsink_get_type (void)
 
   if (!esdsink_type) {
     static const GTypeInfo esdsink_info = {
-      sizeof(GstEsdsinkClass),      NULL,
+      sizeof(GstEsdsinkClass),
+      gst_esdsink_base_init,
       NULL,
       (GClassInitFunc)gst_esdsink_class_init,
       NULL,
@@ -125,6 +124,15 @@ gst_esdsink_get_type (void)
 }
 
 static void
+gst_esdsink_base_init (gpointer g_class)
+{
+  GstElementClass *element_class = GST_ELEMENT_CLASS (g_class);
+
+  gst_element_class_add_pad_template (element_class, GST_PAD_TEMPLATE_GET (sink_factory));
+  gst_element_class_set_details (element_class, &esdsink_details);
+}
+
+static void
 gst_esdsink_class_init (GstEsdsinkClass *klass)
 {
   GObjectClass *gobject_class;
@@ -424,16 +432,8 @@ gst_esdsink_get_property (GObject *object, guint prop_id, GValue *value, GParamS
 gboolean
 gst_esdsink_factory_init (GstPlugin *plugin)
 {
-  GstElementFactory *factory;
-
-  factory = gst_element_factory_new("esdsink", GST_TYPE_ESDSINK,
-				   &esdsink_details);
-  g_return_val_if_fail(factory != NULL, FALSE);
-
-  gst_element_factory_add_pad_template(factory,
-      GST_PAD_TEMPLATE_GET (sink_factory));
-
-  gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory));
+  if (!gst_element_register (plugin, "esdsink", GST_RANK_NONE, GST_TYPE_ESDSINK))
+    return FALSE;
 
   return TRUE;
 }
diff --git a/ext/esd/gstesd.c b/ext/esd/gstesd.c
index 24a9842..cf62bfa 100644
--- a/ext/esd/gstesd.c
+++ b/ext/esd/gstesd.c
@@ -26,7 +26,7 @@
 
 
 static gboolean
-plugin_init (GModule *module, GstPlugin *plugin)
+plugin_init (GstPlugin *plugin)
 {
   gboolean ret;
 
@@ -41,10 +41,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
   return TRUE;
 }
 
-GstPluginDesc plugin_desc = {
+GST_PLUGIN_DEFINE (
   GST_VERSION_MAJOR,
   GST_VERSION_MINOR,
   "esdsink",
-  plugin_init
-};
+  "ESD Element Plugins",
+  plugin_init,
+  VERSION,
+  "LGPL",
+  GST_COPYRIGHT,
+  GST_PACKAGE,
+  GST_ORIGIN)
 
-- 
2.7.4