diff options
author | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-06-20 10:34:48 +0200 |
---|---|---|
committer | Wim Taymans <wim.taymans@collabora.co.uk> | 2012-06-20 10:40:42 +0200 |
commit | dbed726057d3b2488c5d514ce14174fdc2dec6a4 (patch) | |
tree | c61f18985d429410092874a9fe82a0fb0a2d6c2e /ext | |
parent | 9ad37611489735c2dbdf0296367fc8891355f6a4 (diff) | |
download | gstreamer-plugins-bad-dbed726057d3b2488c5d514ce14174fdc2dec6a4.tar.gz |
update for task api change
Diffstat (limited to 'ext')
-rw-r--r-- | ext/gme/gstgme.c | 5 | ||||
-rw-r--r-- | ext/mimic/gstmimenc.c | 3 | ||||
-rw-r--r-- | ext/modplug/gstmodplug.cc | 4 | ||||
-rw-r--r-- | ext/mpeg2enc/gstmpeg2enc.cc | 2 | ||||
-rw-r--r-- | ext/mplex/gstmplex.cc | 2 | ||||
-rw-r--r-- | ext/musepack/gstmusepackdec.c | 4 | ||||
-rw-r--r-- | ext/sndfile/gstsfsink.c | 2 | ||||
-rw-r--r-- | ext/spc/gstspc.c | 5 | ||||
-rw-r--r-- | ext/timidity/gsttimidity.c | 5 | ||||
-rw-r--r-- | ext/timidity/gstwildmidi.c | 7 |
10 files changed, 22 insertions, 17 deletions
diff --git a/ext/gme/gstgme.c b/ext/gme/gstgme.c index d787dbaf0..b349df734 100644 --- a/ext/gme/gstgme.c +++ b/ext/gme/gstgme.c @@ -256,7 +256,7 @@ gst_gme_dec_src_event (GstPad * pad, GstObject * parent, GstEvent * event) gme->seeking = TRUE; gst_pad_start_task (gme->srcpad, (GstTaskFunction) gst_gme_play, - gme->srcpad); + gme->srcpad, NULL); GST_PAD_STREAM_UNLOCK (gme->srcpad); result = TRUE; @@ -461,7 +461,8 @@ gme_setup (GstGmeDec * gme) gst_segment_init (&seg, GST_FORMAT_TIME); gst_pad_push_event (gme->srcpad, gst_event_new_segment (&seg)); - gst_pad_start_task (gme->srcpad, (GstTaskFunction) gst_gme_play, gme->srcpad); + gst_pad_start_task (gme->srcpad, (GstTaskFunction) gst_gme_play, gme->srcpad, + NULL); gme->initialized = TRUE; gme->seeking = FALSE; diff --git a/ext/mimic/gstmimenc.c b/ext/mimic/gstmimenc.c index f4957ccb1..0a3a241fd 100644 --- a/ext/mimic/gstmimenc.c +++ b/ext/mimic/gstmimenc.c @@ -597,7 +597,8 @@ gst_mim_enc_change_state (GstElement * element, GstStateChange transition) } GST_OBJECT_UNLOCK (mimenc); if (paused_mode) { - if (!gst_pad_start_task (mimenc->srcpad, paused_mode_task, mimenc)) { + if (!gst_pad_start_task (mimenc->srcpad, paused_mode_task, mimenc, + NULL)) { ret = GST_STATE_CHANGE_FAILURE; GST_ERROR_OBJECT (mimenc, "Can not start task"); } diff --git a/ext/modplug/gstmodplug.cc b/ext/modplug/gstmodplug.cc index 645f4fd13..a98014207 100644 --- a/ext/modplug/gstmodplug.cc +++ b/ext/modplug/gstmodplug.cc @@ -402,7 +402,7 @@ gst_modplug_do_seek (GstModPlug * modplug, GstEvent * event) gst_util_uint64_scale_int (cur, modplug->frequency, GST_SECOND); gst_pad_start_task (modplug->sinkpad, - (GstTaskFunction) gst_modplug_loop, modplug); + (GstTaskFunction) gst_modplug_loop, modplug, NULL); GST_PAD_STREAM_UNLOCK (modplug->sinkpad); @@ -593,7 +593,7 @@ gst_modplug_sinkpad_activate_mode (GstPad * pad, GstObject * parent, case GST_PAD_MODE_PULL: if (active) { res = gst_pad_start_task (pad, (GstTaskFunction) gst_modplug_loop, - modplug); + modplug, NULL); } else { res = gst_pad_stop_task (pad); } diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc index ec86693cd..1482ae168 100644 --- a/ext/mpeg2enc/gstmpeg2enc.cc +++ b/ext/mpeg2enc/gstmpeg2enc.cc @@ -406,7 +406,7 @@ gst_mpeg2enc_setcaps (GstMpeg2enc * enc, GstPad * pad, GstCaps * caps) /* now that we have all the setup and buffers are expected incoming; * task can get going */ - gst_pad_start_task (enc->srcpad, (GstTaskFunction) gst_mpeg2enc_loop, enc); + gst_pad_start_task (enc->srcpad, (GstTaskFunction) gst_mpeg2enc_loop, enc, NULL); return TRUE; diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index d548f7832..fc5c459bf 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -537,7 +537,7 @@ gst_mplex_start_task (GstMplex * mplex) if (G_UNLIKELY (mplex->srcresult == GST_FLOW_CUSTOM_SUCCESS) && mplex->job->video_tracks == mplex->num_vpads && mplex->job->audio_tracks == mplex->num_apads) { - gst_pad_start_task (mplex->srcpad, (GstTaskFunction) gst_mplex_loop, mplex); + gst_pad_start_task (mplex->srcpad, (GstTaskFunction) gst_mplex_loop, mplex, NULL); mplex->srcresult = GST_FLOW_OK; } } diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c index 73de68234..10a0f0d8e 100644 --- a/ext/musepack/gstmusepackdec.c +++ b/ext/musepack/gstmusepackdec.c @@ -261,7 +261,7 @@ gst_musepackdec_handle_seek_event (GstMusepackDec * dec, GstEvent * event) GST_DEBUG_OBJECT (dec, "seek successful"); gst_pad_start_task (dec->sinkpad, - (GstTaskFunction) gst_musepackdec_loop, dec->sinkpad); + (GstTaskFunction) gst_musepackdec_loop, dec->sinkpad, NULL); GST_PAD_STREAM_UNLOCK (dec->sinkpad); @@ -493,7 +493,7 @@ gst_musepackdec_sink_activate_pull (GstPad * sinkpad, gboolean active) if (active) { result = gst_pad_start_task (sinkpad, - (GstTaskFunction) gst_musepackdec_loop, sinkpad); + (GstTaskFunction) gst_musepackdec_loop, sinkpad, NULL); } else { result = gst_pad_stop_task (sinkpad); } diff --git a/ext/sndfile/gstsfsink.c b/ext/sndfile/gstsfsink.c index 56dc4b006..06fb451b6 100644 --- a/ext/sndfile/gstsfsink.c +++ b/ext/sndfile/gstsfsink.c @@ -459,7 +459,7 @@ gst_sf_sink_activate_pull (GstBaseSink * basesink, gboolean active) if (active) { /* start task */ result = gst_pad_start_task (basesink->sinkpad, - (GstTaskFunction) gst_sf_sink_loop, basesink->sinkpad); + (GstTaskFunction) gst_sf_sink_loop, basesink->sinkpad, NULL); } else { /* step 2, make sure streaming finishes */ result = gst_pad_stop_task (basesink->sinkpad); diff --git a/ext/spc/gstspc.c b/ext/spc/gstspc.c index 4d76b2425..e5950c576 100644 --- a/ext/spc/gstspc.c +++ b/ext/spc/gstspc.c @@ -325,7 +325,7 @@ gst_spc_dec_src_event (GstPad * pad, GstEvent * event) spc->seeking = TRUE; gst_pad_start_task (spc->srcpad, (GstTaskFunction) spc_play, - spc->srcpad); + spc->srcpad, NULL); GST_PAD_STREAM_UNLOCK (spc->srcpad); result = TRUE; @@ -534,7 +534,8 @@ spc_setup (GstSpcDec * spc) gst_pad_push_event (spc->srcpad, gst_event_new_new_segment (FALSE, 1.0, GST_FORMAT_TIME, 0, -1, 0)); - gst_pad_start_task (spc->srcpad, (GstTaskFunction) spc_play, spc->srcpad); + gst_pad_start_task (spc->srcpad, (GstTaskFunction) spc_play, spc->srcpad, + NULL); /* We can't unreference this buffer because we might need to re-initialize * the emulator with the original data during a reverse seek diff --git a/ext/timidity/gsttimidity.c b/ext/timidity/gsttimidity.c index 1857d53b7..89e592ecf 100644 --- a/ext/timidity/gsttimidity.c +++ b/ext/timidity/gsttimidity.c @@ -423,7 +423,7 @@ gst_timidity_src_event (GstPad * pad, GstEvent * event) timidity->o_seek = TRUE; gst_pad_start_task (timidity->sinkpad, - (GstTaskFunction) gst_timidity_loop, timidity->sinkpad); + (GstTaskFunction) gst_timidity_loop, timidity->sinkpad, NULL); GST_PAD_STREAM_UNLOCK (timidity->sinkpad); GST_DEBUG ("seek done"); @@ -451,7 +451,8 @@ static gboolean gst_timidity_activatepull (GstPad * pad, gboolean active) { if (active) { - return gst_pad_start_task (pad, (GstTaskFunction) gst_timidity_loop, pad); + return gst_pad_start_task (pad, (GstTaskFunction) gst_timidity_loop, pad, + NULL); } else { return gst_pad_stop_task (pad); } diff --git a/ext/timidity/gstwildmidi.c b/ext/timidity/gstwildmidi.c index a37264c21..260624594 100644 --- a/ext/timidity/gstwildmidi.c +++ b/ext/timidity/gstwildmidi.c @@ -524,7 +524,7 @@ gst_wildmidi_do_seek (GstWildmidi * wildmidi, GstEvent * event) gst_wildmidi_get_new_segment_event (wildmidi, GST_FORMAT_TIME)); gst_pad_start_task (wildmidi->sinkpad, - (GstTaskFunction) gst_wildmidi_loop, wildmidi->sinkpad); + (GstTaskFunction) gst_wildmidi_loop, wildmidi->sinkpad, NULL); wildmidi->discont = TRUE; GST_PAD_STREAM_UNLOCK (wildmidi->sinkpad); @@ -567,7 +567,8 @@ static gboolean gst_wildmidi_activatepull (GstPad * pad, gboolean active) { if (active) { - return gst_pad_start_task (pad, (GstTaskFunction) gst_wildmidi_loop, pad); + return gst_pad_start_task (pad, (GstTaskFunction) gst_wildmidi_loop, pad, + NULL); } else { return gst_pad_stop_task (pad); } @@ -777,7 +778,7 @@ gst_wildmidi_sink_event (GstPad * pad, GstEvent * event) wildmidi->state = GST_WILDMIDI_STATE_PARSE; /* now start the parsing task */ gst_pad_start_task (wildmidi->sinkpad, - (GstTaskFunction) gst_wildmidi_loop, wildmidi->sinkpad); + (GstTaskFunction) gst_wildmidi_loop, wildmidi->sinkpad, NULL); /* don't forward the event */ gst_event_unref (event); break; |