diff options
| author | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
|---|---|---|
| committer | Jan Schmidt <thaytan@mad.scientist.com> | 2005-09-05 17:20:29 +0000 |
| commit | 012dfb8b33969b582f9132ac9f95402b3098ff43 (patch) | |
| tree | acff4df23e44c9d15abab2b9877c3f72032da286 /sys/v4l2/gstv4l2element.c | |
| parent | 390621f8de27467709897c92e5fec4605d96be75 (diff) | |
| download | gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.gz gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.tar.bz2 gst-plugins-bad-012dfb8b33969b582f9132ac9f95402b3098ff43.zip | |
Fix up all the state change functions.
Original commit message from CVS:
Fix up all the state change functions.
Diffstat (limited to 'sys/v4l2/gstv4l2element.c')
| -rw-r--r-- | sys/v4l2/gstv4l2element.c | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c index 18c0abd9..139378b3 100644 --- a/sys/v4l2/gstv4l2element.c +++ b/sys/v4l2/gstv4l2element.c @@ -72,8 +72,8 @@ static void gst_v4l2element_set_property (GObject * object, guint prop_id, const GValue * value, GParamSpec * pspec); static void gst_v4l2element_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn -gst_v4l2element_change_state (GstElement * element); +static GstStateChangeReturn +gst_v4l2element_change_state (GstElement * element, GstStateChange transition); static GstElementClass *parent_class = NULL; @@ -562,22 +562,22 @@ gst_v4l2element_get_property (GObject * object, } -static GstElementStateReturn -gst_v4l2element_change_state (GstElement * element) +static GstStateChangeReturn +gst_v4l2element_change_state (GstElement * element, GstStateChange transition) { GstV4l2Element *v4l2element; - g_return_val_if_fail (GST_IS_V4L2ELEMENT (element), GST_STATE_FAILURE); + g_return_val_if_fail (GST_IS_V4L2ELEMENT (element), GST_STATE_CHANGE_FAILURE); v4l2element = GST_V4L2ELEMENT (element); /* if going down into NULL state, close the device if it's open * if going to READY, open the device (and set some options) */ - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_NULL_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_NULL_TO_READY: if (!gst_v4l2_open (v4l2element)) - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; #ifdef HAVE_XVIDEO gst_v4l2_xoverlay_open (v4l2element); @@ -587,13 +587,13 @@ gst_v4l2element_change_state (GstElement * element) g_signal_emit (G_OBJECT (v4l2element), gst_v4l2element_signals[SIGNAL_OPEN], 0, v4l2element->device); break; - case GST_STATE_READY_TO_NULL: + case GST_STATE_CHANGE_READY_TO_NULL: #ifdef HAVE_XVIDEO gst_v4l2_xoverlay_close (v4l2element); #endif if (!gst_v4l2_close (v4l2element)) - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; /* emit yet another signal! wheehee! */ g_signal_emit (G_OBJECT (v4l2element), @@ -602,7 +602,7 @@ gst_v4l2element_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; } |