ESD Updated

Original commit message from CVS:
ESD Updated
This commit is contained in:
Iain Holmes 2003-11-01 15:28:33 +00:00
parent adc599bb66
commit 4865820a8f
3 changed files with 38 additions and 32 deletions

View File

@ -32,11 +32,8 @@
static GstElementDetails esdmon_details = { static GstElementDetails esdmon_details = {
"Esound audio monitor", "Esound audio monitor",
"Source/Audio", "Source/Audio",
"LGPL",
"Monitors audio from an esound server", "Monitors audio from an esound server",
VERSION,
"Richard Boulton <richard-gst@tartarus.org>", "Richard Boulton <richard-gst@tartarus.org>",
"(C) 2002",
}; };
/* Signals and args */ /* 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_class_init (GstEsdmonClass *klass);
static void gst_esdmon_init (GstEsdmon *esdmon); static void gst_esdmon_init (GstEsdmon *esdmon);
@ -142,7 +140,8 @@ gst_esdmon_get_type (void)
if (!esdmon_type) { if (!esdmon_type) {
static const GTypeInfo esdmon_info = { static const GTypeInfo esdmon_info = {
sizeof(GstEsdmonClass), NULL, sizeof(GstEsdmonClass),
gst_esdmon_base_init,
NULL, NULL,
(GClassInitFunc)gst_esdmon_class_init, (GClassInitFunc)gst_esdmon_class_init,
NULL, NULL,
@ -156,6 +155,15 @@ gst_esdmon_get_type (void)
return esdmon_type; return esdmon_type;
} }
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 static void
gst_esdmon_class_init (GstEsdmonClass *klass) gst_esdmon_class_init (GstEsdmonClass *klass)
{ {
@ -365,15 +373,8 @@ gst_esdmon_get_property (GObject *object, guint prop_id, GValue *value, GParamSp
gboolean gboolean
gst_esdmon_factory_init (GstPlugin *plugin) gst_esdmon_factory_init (GstPlugin *plugin)
{ {
GstElementFactory *factory; if (!gst_element_register (plugin, "esdmon", GST_RANK_NONE, GST_TYPE_ESDMON))
return FALSE;
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));
return TRUE; return TRUE;
} }

View File

@ -32,11 +32,8 @@
static GstElementDetails esdsink_details = { static GstElementDetails esdsink_details = {
"Esound audio sink", "Esound audio sink",
"Sink/Audio", "Sink/Audio",
"LGPL",
"Plays audio to an esound server", "Plays audio to an esound server",
VERSION,
"Richard Boulton <richard-gst@tartarus.org>", "Richard Boulton <richard-gst@tartarus.org>",
"(C) 2001",
}; };
/* Signals and args */ /* 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_class_init (GstEsdsinkClass *klass);
static void gst_esdsink_init (GstEsdsink *esdsink); static void gst_esdsink_init (GstEsdsink *esdsink);
@ -110,7 +108,8 @@ gst_esdsink_get_type (void)
if (!esdsink_type) { if (!esdsink_type) {
static const GTypeInfo esdsink_info = { static const GTypeInfo esdsink_info = {
sizeof(GstEsdsinkClass), NULL, sizeof(GstEsdsinkClass),
gst_esdsink_base_init,
NULL, NULL,
(GClassInitFunc)gst_esdsink_class_init, (GClassInitFunc)gst_esdsink_class_init,
NULL, NULL,
@ -124,6 +123,15 @@ gst_esdsink_get_type (void)
return esdsink_type; return esdsink_type;
} }
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 static void
gst_esdsink_class_init (GstEsdsinkClass *klass) gst_esdsink_class_init (GstEsdsinkClass *klass)
{ {
@ -424,16 +432,8 @@ gst_esdsink_get_property (GObject *object, guint prop_id, GValue *value, GParamS
gboolean gboolean
gst_esdsink_factory_init (GstPlugin *plugin) gst_esdsink_factory_init (GstPlugin *plugin)
{ {
GstElementFactory *factory; if (!gst_element_register (plugin, "esdsink", GST_RANK_NONE, GST_TYPE_ESDSINK))
return FALSE;
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));
return TRUE; return TRUE;
} }

View File

@ -26,7 +26,7 @@
static gboolean static gboolean
plugin_init (GModule *module, GstPlugin *plugin) plugin_init (GstPlugin *plugin)
{ {
gboolean ret; gboolean ret;
@ -41,10 +41,15 @@ plugin_init (GModule *module, GstPlugin *plugin)
return TRUE; return TRUE;
} }
GstPluginDesc plugin_desc = { GST_PLUGIN_DEFINE (
GST_VERSION_MAJOR, GST_VERSION_MAJOR,
GST_VERSION_MINOR, GST_VERSION_MINOR,
"esdsink", "esdsink",
plugin_init "ESD Element Plugins",
}; plugin_init,
VERSION,
"LGPL",
GST_COPYRIGHT,
GST_PACKAGE,
GST_ORIGIN)