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/qcam | |
| 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/qcam')
| -rw-r--r-- | sys/qcam/gstqcamsrc.c | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c index 2fab71d9..e34a589e 100644 --- a/sys/qcam/gstqcamsrc.c +++ b/sys/qcam/gstqcamsrc.c @@ -113,7 +113,8 @@ static void gst_qcamsrc_set_property (GObject * object, guint prop_id, static void gst_qcamsrc_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); -static GstElementStateReturn gst_qcamsrc_change_state (GstElement * element); +static GstStateChangeReturn gst_qcamsrc_change_state (GstElement * element, + GstStateChange transition); static void gst_qcamsrc_close (GstQCamSrc * src); static gboolean gst_qcamsrc_open (GstQCamSrc * src); @@ -381,22 +382,22 @@ gst_qcamsrc_get_property (GObject * object, guint prop_id, GValue * value, } } -static GstElementStateReturn -gst_qcamsrc_change_state (GstElement * element) +static GstStateChangeReturn +gst_qcamsrc_change_state (GstElement * element, GstStateChange transition) { g_return_val_if_fail (GST_IS_QCAMSRC (element), FALSE); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_READY_TO_NULL: + switch (transition) { + case GST_STATE_CHANGE_READY_TO_NULL: if (GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) gst_qcamsrc_close (GST_QCAMSRC (element)); break; - case GST_STATE_NULL_TO_READY: + case GST_STATE_CHANGE_NULL_TO_READY: if (!GST_FLAG_IS_SET (element, GST_QCAMSRC_OPEN)) { GST_DEBUG ("opening"); if (!gst_qcamsrc_open (GST_QCAMSRC (element))) { GST_DEBUG ("open failed"); - return GST_STATE_FAILURE; + return GST_STATE_CHANGE_FAILURE; } } break; @@ -405,9 +406,9 @@ gst_qcamsrc_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 gboolean |