From 6d5504f6497bac3dfd697b0482b937153fd083ed Mon Sep 17 00:00:00 2001 From: Iain Holmes Date: Sat, 1 Nov 2003 14:04:20 +0000 Subject: Update all the audiofile stuff Original commit message from CVS: Update all the audiofile stuff --- ext/audiofile/gstafsrc.c | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'ext/audiofile/gstafsrc.c') diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c index 8c1a0c69..13e228fc 100644 --- a/ext/audiofile/gstafsrc.c +++ b/ext/audiofile/gstafsrc.c @@ -32,11 +32,8 @@ static GstElementDetails afsrc_details = { "Audiofile Src", "Source/Audio", - "LGPL", "Read audio files from disk using libaudiofile", - VERSION, "Thomas ", - "(C) 2001" }; @@ -99,6 +96,7 @@ gst_afsrc_types_get_type (void) return afsrc_types_type; } */ +static void gst_afsrc_base_init (gpointer g_class); static void gst_afsrc_class_init (GstAFSrcClass *klass); static void gst_afsrc_init (GstAFSrc *afsrc); @@ -124,7 +122,8 @@ gst_afsrc_get_type (void) if (!afsrc_type) { static const GTypeInfo afsrc_info = { - sizeof (GstAFSrcClass), NULL, + sizeof (GstAFSrcClass), + gst_afsrc_base_init, NULL, (GClassInitFunc) gst_afsrc_class_init, NULL, @@ -138,6 +137,15 @@ gst_afsrc_get_type (void) return afsrc_type; } +static void +gst_afsrc_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 (afsrc_src_factory)); + gst_element_class_set_details (element_class, &afsrc_details); +} + static void gst_afsrc_class_init (GstAFSrcClass *klass) { @@ -274,21 +282,14 @@ gst_afsrc_get_property (GObject *object, guint prop_id, GValue *value, GParamSpe } gboolean -gst_afsrc_plugin_init (GModule *module, GstPlugin *plugin) +gst_afsrc_plugin_init (GstPlugin *plugin) { - GstElementFactory *factory; - - factory = gst_element_factory_new ("afsrc", GST_TYPE_AFSRC, - &afsrc_details); - g_return_val_if_fail (factory != NULL, FALSE); - - gst_element_factory_add_pad_template (factory, GST_PAD_TEMPLATE_GET (afsrc_src_factory)); - - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); - /* load audio support library */ if (!gst_library_load ("gstaudio")) return FALSE; + + if (!gst_element_register (plugin, "afsrc", GST_RANK_NONE, GST_TYPE_AFSRC)) + return FALSE; return TRUE; } -- cgit v1.2.1