diff options
| author | Iain Holmes <iain@prettypeople.org> | 2003-11-02 01:32:40 +0000 |
|---|---|---|
| committer | Iain Holmes <iain@prettypeople.org> | 2003-11-02 01:32:40 +0000 |
| commit | 81a861de05fe225a9d7f681662fedfb7e2a4152f (patch) | |
| tree | 68de62da592d7320176fd6d9ba5238dcce3362d0 | |
| parent | 7f6522fa088045ca3b422017d19a91d11c6bff72 (diff) | |
| download | gst-plugins-bad-81a861de05fe225a9d7f681662fedfb7e2a4152f.tar.gz gst-plugins-bad-81a861de05fe225a9d7f681662fedfb7e2a4152f.tar.bz2 gst-plugins-bad-81a861de05fe225a9d7f681662fedfb7e2a4152f.zip | |
Make smoothwave compile again
Original commit message from CVS:
Make smoothwave compile again
| -rw-r--r-- | ext/smoothwave/gstsmoothwave.c | 39 | ||||
| -rw-r--r-- | gst/smoothwave/gstsmoothwave.c | 39 |
2 files changed, 44 insertions, 34 deletions
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c index 5fcd79c0..807aa98b 100644 --- a/ext/smoothwave/gstsmoothwave.c +++ b/ext/smoothwave/gstsmoothwave.c @@ -28,11 +28,8 @@ static GstElementDetails gst_smoothwave_details = { "Smooth waveform", "Visualization", - "LGPL", "Fading grayscale waveform display", - VERSION, "Erik Walthinsen <omega@cse.ogi.edu>", - "(C) 1999", }; @@ -49,7 +46,7 @@ enum { ARG_WIDGET, }; - +static void gst_smoothwave_base_init (gpointer g_class); static void gst_smoothwave_class_init (GstSmoothWaveClass *klass); static void gst_smoothwave_init (GstSmoothWave *smoothwave); @@ -69,7 +66,8 @@ gst_smoothwave_get_type (void) if (!smoothwave_type) { static const GTypeInfo smoothwave_info = { - sizeof(GstSmoothWaveClass), NULL, + sizeof(GstSmoothWaveClass), + gst_smoothwave_base_init, NULL, (GClassInitFunc)gst_smoothwave_class_init, NULL, @@ -84,6 +82,14 @@ gst_smoothwave_get_type (void) } static void +gst_smoothwave_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details (element_class, &gst_smoothwave_details); +} + +static void gst_smoothwave_class_init (GstSmoothWaveClass *klass) { GObjectClass *gobject_class; @@ -288,23 +294,22 @@ gst_smoothwave_get_property (GObject *object, guint prop_id, GValue *value, GPar static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +plugin_init (GstPlugin *plugin) { - GstElementFactory *factory; - - /* create an elementfactory for the smoothwave element */ - factory = gst_element_factory_new("smoothwave",GST_TYPE_SMOOTHWAVE, - &gst_smoothwave_details); - g_return_val_if_fail(factory != NULL, FALSE); - - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); + if (!gst_element_register (plugin, "smoothwave", GST_RANK_NONE, GST_TYPE_SMOOTHWAVE)) + return FALSE; return TRUE; } -GstPluginDesc plugin_desc = { +GST_PLUGIN_DEFINE ( GST_VERSION_MAJOR, GST_VERSION_MINOR, "smoothwave", - plugin_init -}; + "Fading greyscale waveform display", + plugin_init, + VERSION, + "LGPL", + GST_COPYRIGHT, + GST_PACKAGE, + GST_ORIGIN) diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c index 5fcd79c0..807aa98b 100644 --- a/gst/smoothwave/gstsmoothwave.c +++ b/gst/smoothwave/gstsmoothwave.c @@ -28,11 +28,8 @@ static GstElementDetails gst_smoothwave_details = { "Smooth waveform", "Visualization", - "LGPL", "Fading grayscale waveform display", - VERSION, "Erik Walthinsen <omega@cse.ogi.edu>", - "(C) 1999", }; @@ -49,7 +46,7 @@ enum { ARG_WIDGET, }; - +static void gst_smoothwave_base_init (gpointer g_class); static void gst_smoothwave_class_init (GstSmoothWaveClass *klass); static void gst_smoothwave_init (GstSmoothWave *smoothwave); @@ -69,7 +66,8 @@ gst_smoothwave_get_type (void) if (!smoothwave_type) { static const GTypeInfo smoothwave_info = { - sizeof(GstSmoothWaveClass), NULL, + sizeof(GstSmoothWaveClass), + gst_smoothwave_base_init, NULL, (GClassInitFunc)gst_smoothwave_class_init, NULL, @@ -84,6 +82,14 @@ gst_smoothwave_get_type (void) } static void +gst_smoothwave_base_init (gpointer g_class) +{ + GstElementClass *element_class = GST_ELEMENT_CLASS (g_class); + + gst_element_class_set_details (element_class, &gst_smoothwave_details); +} + +static void gst_smoothwave_class_init (GstSmoothWaveClass *klass) { GObjectClass *gobject_class; @@ -288,23 +294,22 @@ gst_smoothwave_get_property (GObject *object, guint prop_id, GValue *value, GPar static gboolean -plugin_init (GModule *module, GstPlugin *plugin) +plugin_init (GstPlugin *plugin) { - GstElementFactory *factory; - - /* create an elementfactory for the smoothwave element */ - factory = gst_element_factory_new("smoothwave",GST_TYPE_SMOOTHWAVE, - &gst_smoothwave_details); - g_return_val_if_fail(factory != NULL, FALSE); - - gst_plugin_add_feature (plugin, GST_PLUGIN_FEATURE (factory)); + if (!gst_element_register (plugin, "smoothwave", GST_RANK_NONE, GST_TYPE_SMOOTHWAVE)) + return FALSE; return TRUE; } -GstPluginDesc plugin_desc = { +GST_PLUGIN_DEFINE ( GST_VERSION_MAJOR, GST_VERSION_MINOR, "smoothwave", - plugin_init -}; + "Fading greyscale waveform display", + plugin_init, + VERSION, + "LGPL", + GST_COPYRIGHT, + GST_PACKAGE, + GST_ORIGIN) |