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/videomixer/videomixer.c | 26 +++++++++++++------------- 1 file changed, 13 insertions(+), 13 deletions(-) (limited to 'gst/videomixer') diff --git a/gst/videomixer/videomixer.c b/gst/videomixer/videomixer.c index 552e6afd..71e591d2 100644 --- a/gst/videomixer/videomixer.c +++ b/gst/videomixer/videomixer.c @@ -409,7 +409,8 @@ static void gst_videomixer_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_videomixer_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_videomixer_change_state (GstElement * element); +static GstStateChangeReturn gst_videomixer_change_state (GstElement * element, + GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -1112,31 +1113,30 @@ gst_videomixer_set_property (GObject * object, } } -static GstElementStateReturn -gst_videomixer_change_state (GstElement * element) +static GstStateChangeReturn +gst_videomixer_change_state (GstElement * element, GstStateChange transition) { GstVideoMixer *mix; - gint transition = GST_STATE_TRANSITION (element); - g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_VIDEO_MIXER (element), GST_STATE_CHANGE_FAILURE); mix = GST_VIDEO_MIXER (element); switch (transition) { - case GST_STATE_NULL_TO_READY: - case GST_STATE_READY_TO_PAUSED: + case GST_STATE_CHANGE_NULL_TO_READY: + case GST_STATE_CHANGE_READY_TO_PAUSED: break; - case GST_STATE_PAUSED_TO_PLAYING: - case GST_STATE_PLAYING_TO_PAUSED: - case GST_STATE_PAUSED_TO_READY: - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_PAUSED_TO_PLAYING: + case GST_STATE_CHANGE_PLAYING_TO_PAUSED: + case GST_STATE_CHANGE_PAUSED_TO_READY: + case GST_STATE_CHANGE_READY_TO_NULL: break; } 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 gboolean -- cgit