summaryrefslogtreecommitdiff
path: root/gst
diff options
context:
space:
mode:
authorStefan Kost <ensonic@users.sf.net>2010-09-28 14:16:58 +0300
committerStefan Kost <ensonic@users.sf.net>2010-09-28 14:23:40 +0300
commit7bd3e239a5dde7a0c7bd991a2dafb4c5f910b4a1 (patch)
tree45bc63e89fe805cc99bf7822c3620d1ee7dfce48 /gst
parent7e63d37f1cb2e20383669fc5e5334d0b33e26f36 (diff)
downloadgstreamer-plugins-bad-7bd3e239a5dde7a0c7bd991a2dafb4c5f910b4a1.tar.gz
liveadder: use base_init for pad_templates and element_details
Diffstat (limited to 'gst')
-rw-r--r--gst/liveadder/liveadder.c27
1 files changed, 12 insertions, 15 deletions
diff --git a/gst/liveadder/liveadder.c b/gst/liveadder/liveadder.c
index 682754c54..d5eea3438 100644
--- a/gst/liveadder/liveadder.c
+++ b/gst/liveadder/liveadder.c
@@ -153,21 +153,7 @@ MAKE_FUNC_NC (add_float32, gfloat, gfloat)
static void
gst_live_adder_base_init (gpointer klass)
{
-}
-
-static void
-gst_live_adder_class_init (GstLiveAdderClass * klass)
-{
- GObjectClass *gobject_class;
- GstElementClass *gstelement_class;
-
- gobject_class = (GObjectClass *) klass;
-
- gobject_class->finalize = gst_live_adder_finalize;
- gobject_class->set_property = gst_live_adder_set_property;
- gobject_class->get_property = gst_live_adder_get_property;
-
- gstelement_class = (GstElementClass *) klass;
+ GstElementClass *gstelement_class = (GstElementClass *) klass;
gst_element_class_add_pad_template (gstelement_class,
gst_static_pad_template_get (&gst_live_adder_src_template));
@@ -177,6 +163,17 @@ gst_live_adder_class_init (GstLiveAdderClass * klass)
"Generic/Audio",
"Mixes live/discontinuous audio streams",
"Olivier Crete <olivier.crete@collabora.co.uk>");
+}
+
+static void
+gst_live_adder_class_init (GstLiveAdderClass * klass)
+{
+ GObjectClass *gobject_class = (GObjectClass *) klass;
+ GstElementClass *gstelement_class = (GstElementClass *) klass;
+
+ gobject_class->finalize = gst_live_adder_finalize;
+ gobject_class->set_property = gst_live_adder_set_property;
+ gobject_class->get_property = gst_live_adder_get_property;
parent_class = g_type_class_peek_parent (klass);