diff options
author | Iain Holmes <iain@prettypeople.org> | 2003-11-01 15:28:33 +0000 |
---|---|---|
committer | Iain Holmes <iain@prettypeople.org> | 2003-11-01 15:28:33 +0000 |
commit | 4865820a8f7168ebb72a6ab8f6b30a6c714883e0 (patch) | |
tree | 6de3d7147485f802d8dbce756c38a8ba648e833f /ext/esd/esdmon.c | |
parent | adc599bb661aa932ba6eb36cbaa5911f13095c67 (diff) |
ESD Updated
Original commit message from CVS:
ESD Updated
Diffstat (limited to 'ext/esd/esdmon.c')
-rw-r--r-- | ext/esd/esdmon.c | 29 |
1 files changed, 15 insertions, 14 deletions
diff --git a/ext/esd/esdmon.c b/ext/esd/esdmon.c index de7e1148..2ddb1770 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; } |