From 7ebd7b97d480d4047051c29ad5213791b7620f6c Mon Sep 17 00:00:00 2001 From: Andy Wingo Date: Fri, 2 Sep 2005 15:44:50 +0000 Subject: All plugins updated for element state changes. Original commit message from CVS: 2005-09-02 Andy Wingo * All plugins updated for element state changes. --- gst/oldcore/gstmd5sink.c | 19 ++++++++++--------- gst/oldcore/gstmultifilesrc.c | 13 +++++++------ gst/oldcore/gstpipefilter.c | 13 +++++++------ 3 files changed, 24 insertions(+), 21 deletions(-) (limited to 'gst/oldcore') diff --git a/gst/oldcore/gstmd5sink.c b/gst/oldcore/gstmd5sink.c index 8626c4ee..bd661bfc 100644 --- a/gst/oldcore/gstmd5sink.c +++ b/gst/oldcore/gstmd5sink.c @@ -72,7 +72,8 @@ static void gst_md5sink_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); static void gst_md5sink_chain (GstPad * pad, GstData * _data); -static GstElementStateReturn gst_md5sink_change_state (GstElement * element); +static GstStateChangeReturn gst_md5sink_change_state (GstElement * element, + GstStateChange transition); /* MD5 stuff */ @@ -415,22 +416,22 @@ gst_md5sink_init (GstMD5Sink * md5sink) md5_init_ctx (md5sink); } -static GstElementStateReturn -gst_md5sink_change_state (GstElement * element) +static GstStateChangeReturn +gst_md5sink_change_state (GstElement * element, GstStateChange transition) { GstMD5Sink *sink; /* element check */ sink = GST_MD5SINK (element); - g_return_val_if_fail (GST_IS_MD5SINK (sink), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_MD5SINK (sink), GST_STATE_CHANGE_FAILURE); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_READY_TO_PAUSED: + switch (transition) { + case GST_STATE_CHANGE_READY_TO_PAUSED: md5_init_ctx (sink); g_object_notify (G_OBJECT (element), "md5"); break; - case GST_STATE_PAUSED_TO_READY: + case GST_STATE_CHANGE_PAUSED_TO_READY: md5_finish_ctx (sink, sink->md5); g_object_notify (G_OBJECT (element), "md5"); break; @@ -439,9 +440,9 @@ gst_md5sink_change_state (GstElement * element) } if ((GST_ELEMENT_CLASS (parent_class)->change_state)) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } static void diff --git a/gst/oldcore/gstmultifilesrc.c b/gst/oldcore/gstmultifilesrc.c index 593f66b5..2d309f4f 100644 --- a/gst/oldcore/gstmultifilesrc.c +++ b/gst/oldcore/gstmultifilesrc.c @@ -80,7 +80,7 @@ static GstData *gst_multifilesrc_get (GstPad * pad); /*static GstBuffer * gst_multifilesrc_get_region (GstPad *pad,GstRegionType type,guint64 offset,guint64 len);*/ -static GstElementStateReturn gst_multifilesrc_change_state (GstElement * +static GstStateChangeReturn gst_multifilesrc_change_state (GstElement * element); static gboolean gst_multifilesrc_open_file (GstMultiFileSrc * src, @@ -345,10 +345,11 @@ gst_multifilesrc_close_file (GstMultiFileSrc * src) GST_FLAG_UNSET (src, GST_MULTIFILESRC_OPEN); } -static GstElementStateReturn -gst_multifilesrc_change_state (GstElement * element) +static GstStateChangeReturn +gst_multifilesrc_change_state (GstElement * element, GstStateChange transition) { - g_return_val_if_fail (GST_IS_MULTIFILESRC (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_MULTIFILESRC (element), + GST_STATE_CHANGE_FAILURE); if (GST_STATE_PENDING (element) == GST_STATE_NULL) { if (GST_FLAG_IS_SET (element, GST_MULTIFILESRC_OPEN)) @@ -356,7 +357,7 @@ gst_multifilesrc_change_state (GstElement * element) } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } diff --git a/gst/oldcore/gstpipefilter.c b/gst/oldcore/gstpipefilter.c index 731cc056..c171760f 100644 --- a/gst/oldcore/gstpipefilter.c +++ b/gst/oldcore/gstpipefilter.c @@ -86,7 +86,8 @@ static GstData *gst_pipefilter_get (GstPad * pad); static void gst_pipefilter_chain (GstPad * pad, GstData * _data); static gboolean gst_pipefilter_handle_event (GstPad * pad, GstEvent * event); -static GstElementStateReturn gst_pipefilter_change_state (GstElement * element); +static GstStateChangeReturn gst_pipefilter_change_state (GstElement * element, + GstStateChange transition); static void gst_pipefilter_base_init (gpointer g_class) @@ -331,8 +332,8 @@ gst_pipefilter_close_file (GstPipefilter * src) GST_FLAG_UNSET (src, GST_PIPEFILTER_OPEN); } -static GstElementStateReturn -gst_pipefilter_change_state (GstElement * element) +static GstStateChangeReturn +gst_pipefilter_change_state (GstElement * element, GstStateChange transition) { g_return_val_if_fail (GST_IS_PIPEFILTER (element), FALSE); @@ -344,11 +345,11 @@ gst_pipefilter_change_state (GstElement * element) } else { if (!GST_FLAG_IS_SET (element, GST_PIPEFILTER_OPEN)) { if (!gst_pipefilter_open_file (GST_PIPEFILTER (element))) - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } } if (GST_ELEMENT_CLASS (parent_class)->change_state) - return GST_ELEMENT_CLASS (parent_class)->change_state (element); - return GST_STATE_SUCCESS; + return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition); + return GST_STATE_CHANGE_SUCCESS; } -- cgit