summaryrefslogtreecommitdiffstats
path: root/ext/ladspa
diff options
context:
space:
mode:
authorAndy Wingo <wingo@pobox.com>2005-08-28 17:59:20 +0000
committerAndy Wingo <wingo@pobox.com>2005-08-28 17:59:20 +0000
commit99fc32962a35d65cce34a5f59948502eee1ac6b4 (patch)
tree56e3cb1fa8ab36ac98c0c5fc46e6266aaaa2c4b1 /ext/ladspa
parentb5c9e10399d4b33655e330d806c0a299e927bba0 (diff)
Updates for two-arg init from GST_BOILERPLATE.
Original commit message from CVS: 2005-08-28 Andy Wingo <wingo@pobox.com> * Updates for two-arg init from GST_BOILERPLATE. * ext/ladspa/gstsignalprocessor.c (gst_signal_processor_init): Use the second arg for the class, because G_OBJECT_GET_CLASS (self) returns the wrong thing. (gst_signal_processor_add_pad_from_template): Make pads of the right type. * ext/ladspa/gstladspa.c (gst_ladspa_class_get_param_spec): Make writable param specs G_PARAM_CONSTRUCT so default values work. (gst_ladspa_init): Use the second arg for the class.
Diffstat (limited to 'ext/ladspa')
-rw-r--r--ext/ladspa/gstladspa.c11
-rw-r--r--ext/ladspa/gstsignalprocessor.c15
2 files changed, 13 insertions, 13 deletions
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c
index 66109002..dbf9f933 100644
--- a/ext/ladspa/gstladspa.c
+++ b/ext/ladspa/gstladspa.c
@@ -70,6 +70,8 @@ gst_ladspa_base_init (gpointer g_class)
LADSPA_Descriptor *desc;
gint j, sinkcount, srccount;
+ GST_DEBUG ("base_init %p", g_class);
+
desc = g_hash_table_lookup (ladspa_descriptors,
GINT_TO_POINTER (G_TYPE_FROM_CLASS (klass)));
if (!desc)
@@ -186,7 +188,7 @@ gst_ladspa_class_get_param_spec (GstLADSPAClass * klass, gint portnum)
name = gst_ladspa_class_get_param_name (klass, portnum);
perms = G_PARAM_READABLE;
if (LADSPA_IS_PORT_INPUT (desc->PortDescriptors[portnum]))
- perms |= G_PARAM_WRITABLE;
+ perms |= G_PARAM_WRITABLE | G_PARAM_CONSTRUCT;
/* short name for hint descriptor */
hintdesc = desc->PortRangeHints[portnum].HintDescriptor;
@@ -283,6 +285,8 @@ gst_ladspa_class_init (GstLADSPAClass * klass)
LADSPA_Descriptor *desc;
gint i, control_in_count, control_out_count;
+ GST_DEBUG ("class_init %p", klass);
+
gobject_class = (GObjectClass *) klass;
gobject_class->set_property = gst_ladspa_set_property;
gobject_class->get_property = gst_ladspa_get_property;
@@ -349,12 +353,11 @@ gst_ladspa_class_init (GstLADSPAClass * klass)
}
static void
-gst_ladspa_init (GstLADSPA * ladspa)
+gst_ladspa_init (GstLADSPA * ladspa, GstLADSPAClass * klass)
{
/* whoopee, nothing to do */
- ladspa->descriptor =
- ((GstLADSPAClass *) G_OBJECT_GET_CLASS (ladspa))->descriptor;
+ ladspa->descriptor = klass->descriptor;
ladspa->activated = FALSE;
ladspa->inplace_broken =
LADSPA_IS_INPLACE_BROKEN (ladspa->descriptor->Properties);
diff --git a/ext/ladspa/gstsignalprocessor.c b/ext/ladspa/gstsignalprocessor.c
index 7fea9a90..7b79dde2 100644
--- a/ext/ladspa/gstsignalprocessor.c
+++ b/ext/ladspa/gstsignalprocessor.c
@@ -186,8 +186,9 @@ gst_signal_processor_add_pad_from_template (GstSignalProcessor * self,
{
GstPad *new;
- new = g_object_new (GST_TYPE_PAD, "name", GST_OBJECT_NAME (templ),
- "direction", templ->direction, "template", templ, NULL);
+ new = g_object_new (GST_TYPE_SIGNAL_PROCESSOR_PAD,
+ "name", GST_OBJECT_NAME (templ), "direction", templ->direction,
+ "template", templ, NULL);
GST_SIGNAL_PROCESSOR_PAD (new)->index =
GST_SIGNAL_PROCESSOR_PAD_TEMPLATE (templ)->index;
@@ -212,17 +213,13 @@ gst_signal_processor_add_pad_from_template (GstSignalProcessor * self,
}
static void
-gst_signal_processor_init (GstSignalProcessor * self)
+gst_signal_processor_init (GstSignalProcessor * self,
+ GstSignalProcessorClass * klass)
{
- GstSignalProcessorClass *klass;
GList *templates;
- klass = GST_SIGNAL_PROCESSOR_GET_CLASS (self);
-
- GST_DEBUG ("gst_signal_processor_init");
-
templates =
- gst_element_class_get_pad_template_list (GST_ELEMENT_GET_CLASS (self));
+ gst_element_class_get_pad_template_list (GST_ELEMENT_CLASS (klass));
while (templates) {
GstPadTemplate *templ = GST_PAD_TEMPLATE (templates->data);