diff options
| author | Wim Taymans <wim.taymans@gmail.com> | 2002-03-30 17:06:26 +0000 |
|---|---|---|
| committer | Wim Taymans <wim.taymans@gmail.com> | 2002-03-30 17:06:26 +0000 |
| commit | 13d9e8d35227337a04b0cd24a0dda7c0c3961289 (patch) | |
| tree | 9a4e6fa918604e74a46251b50d2f26d7c0d2d024 /ext/ladspa | |
| parent | c5e4b06ff518ca83a403c175e22a802ee73714f1 (diff) | |
Changed to the new props API
Original commit message from CVS:
Changed to the new props API
Other small tuff.
Diffstat (limited to 'ext/ladspa')
| -rw-r--r-- | ext/ladspa/gstladspa.c | 22 |
1 files changed, 14 insertions, 8 deletions
diff --git a/ext/ladspa/gstladspa.c b/ext/ladspa/gstladspa.c index 69eeed53..bb49547b 100644 --- a/ext/ladspa/gstladspa.c +++ b/ext/ladspa/gstladspa.c @@ -109,7 +109,7 @@ gst_ladspa_get_bufferpool (GstPad *pad) { gint i; GstBufferPool *bp; - GstLADSPA *ladspa = gst_pad_get_parent (pad); + GstLADSPA *ladspa = (GstLADSPA *) gst_pad_get_parent (pad); GstLADSPAClass *oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa)); if (oclass->numsrcpads > 0) @@ -394,7 +394,7 @@ gst_ladspa_init (GstLADSPA *ladspa) } ladspa->loopbased = TRUE; - gst_element_set_loop_function (ladspa, gst_ladspa_loop); + gst_element_set_loop_function (GST_ELEMENT (ladspa), gst_ladspa_loop); } gst_ladspa_instantiate(ladspa); @@ -406,13 +406,15 @@ gst_ladspa_connect (GstPad *pad, GstCaps *caps) GstLADSPA *ladspa = (GstLADSPA *) GST_PAD_PARENT (pad); GstLADSPAClass *oclass = (GstLADSPAClass *) (G_OBJECT_GET_CLASS (ladspa)); guint i; + gint rate; g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_DELAYED); g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_DELAYED); + gst_caps_get_int (caps, "rate", &rate); /* have to instantiate ladspa plugin when samplerate changes (groan) */ - if (ladspa->samplerate != gst_caps_get_int (caps, "rate")){ - ladspa->samplerate = gst_caps_get_int (caps, "rate"); + if (ladspa->samplerate != rate){ + ladspa->samplerate = rate; if (! gst_ladspa_instantiate(ladspa)) return GST_PAD_CONNECT_REFUSED; } @@ -434,12 +436,15 @@ static GstPadConnectReturn gst_ladspa_connect_get (GstPad *pad, GstCaps *caps) { GstLADSPA *ladspa = (GstLADSPA*)GST_OBJECT_PARENT (pad); + gint rate; g_return_val_if_fail (caps != NULL, GST_PAD_CONNECT_DELAYED); g_return_val_if_fail (pad != NULL, GST_PAD_CONNECT_DELAYED); - if (ladspa->samplerate != gst_caps_get_int (caps, "rate")) { - ladspa->samplerate = gst_caps_get_int (caps, "rate"); + gst_caps_get_int (caps, "rate", &rate); + + if (ladspa->samplerate != rate) { + ladspa->samplerate = rate; if (! gst_ladspa_instantiate(ladspa)) return GST_PAD_CONNECT_REFUSED; } @@ -674,7 +679,7 @@ gst_ladspa_deactivate(GstLADSPA *ladspa) static void gst_ladspa_loop (GstElement *element) { - gint8 *raw_in, *zero_out, i, cur_buf; + gint8 *raw_in, *zero_out, i; GstBuffer **buffers_out; GstEvent *event = NULL; guint32 waiting; @@ -703,7 +708,8 @@ gst_ladspa_loop (GstElement *element) /* first get all the necessary data from the input ports */ for (i=0;i<oclass->numsinkpads;i++){ - GST_DEBUG (0, "pulling %d bytes through channel %d's bytestream", i); + GST_DEBUG (0, "pulling %d bytes through channel %d'sbytestream\n", + ladspa->buffersize * sizeof (LADSPA_Data), i); raw_in = gst_bytestream_peek_bytes (ladspa->bytestreams[i], ladspa->buffersize * sizeof (LADSPA_Data)); if (raw_in == NULL) { |