Commit c9b26381 authored by Iain Holmes's avatar Iain Holmes

Update artsdsink too

Original commit message from CVS:
Update artsdsink too
parent 0cc17ce5
...@@ -29,11 +29,8 @@ ...@@ -29,11 +29,8 @@
static GstElementDetails artsdsink_details = { static GstElementDetails artsdsink_details = {
"aRtsd audio sink", "aRtsd audio sink",
"Sink/Audio", "Sink/Audio",
"LGPL",
"Plays audio to an aRts server", "Plays audio to an aRts server",
VERSION,
"Richard Boulton <richard-gst@tartarus.org>", "Richard Boulton <richard-gst@tartarus.org>",
"(C) 2001",
}; };
/* Signals and args */ /* Signals and args */
...@@ -75,6 +72,7 @@ GST_PAD_TEMPLATE_FACTORY (sink_factory, ...@@ -75,6 +72,7 @@ GST_PAD_TEMPLATE_FACTORY (sink_factory,
) )
); );
static void gst_artsdsink_base_init (gpointer g_class);
static void gst_artsdsink_class_init (GstArtsdsinkClass *klass); static void gst_artsdsink_class_init (GstArtsdsinkClass *klass);
static void gst_artsdsink_init (GstArtsdsink *artsdsink); static void gst_artsdsink_init (GstArtsdsink *artsdsink);
...@@ -100,7 +98,8 @@ gst_artsdsink_get_type (void) ...@@ -100,7 +98,8 @@ gst_artsdsink_get_type (void)
if (!artsdsink_type) { if (!artsdsink_type) {
static const GTypeInfo artsdsink_info = { static const GTypeInfo artsdsink_info = {
sizeof(GstArtsdsinkClass), NULL, sizeof(GstArtsdsinkClass),
gst_artsdsink_base_init,
NULL, NULL,
(GClassInitFunc)gst_artsdsink_class_init, (GClassInitFunc)gst_artsdsink_class_init,
NULL, NULL,
...@@ -114,6 +113,15 @@ gst_artsdsink_get_type (void) ...@@ -114,6 +113,15 @@ gst_artsdsink_get_type (void)
return artsdsink_type; return artsdsink_type;
} }
static void
gst_artsdsink_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, &artsdsink_details);
}
static void static void
gst_artsdsink_class_init (GstArtsdsinkClass *klass) gst_artsdsink_class_init (GstArtsdsinkClass *klass)
{ {
...@@ -271,27 +279,25 @@ gst_artsdsink_get_property (GObject *object, guint prop_id, GValue *value, GPara ...@@ -271,27 +279,25 @@ gst_artsdsink_get_property (GObject *object, guint prop_id, GValue *value, GPara
} }
static gboolean static gboolean
plugin_init (GModule *module, GstPlugin *plugin) plugin_init (GstPlugin *plugin)
{ {
GstElementFactory *factory; if (!gst_element_register (plugin, "artsdsink", GST_RANK_NONE, GST_TYPE_ARTSDSINK))
return FALSE;
factory = gst_element_factory_new("artsdsink", GST_TYPE_ARTSDSINK,
&artsdsink_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));
return TRUE; return TRUE;
} }
GstPluginDesc plugin_desc = { GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR, GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"artsdsink", "artsdsink",
plugin_init "Plays audio to an aRts server",
}; plugin_init,
VERSION,
"LGPL",
GST_COPYRIGHT,
GST_PACKAGE,
GST_ORIGIN)
static gboolean static gboolean
gst_artsdsink_open_audio (GstArtsdsink *sink) gst_artsdsink_open_audio (GstArtsdsink *sink)
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment