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 /ext/mplex | |
| 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 'ext/mplex')
| -rw-r--r-- | ext/mplex/gstmplex.cc | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc index 9ec4a931..a4c92f9c 100644 --- a/ext/mplex/gstmplex.cc +++ b/ext/mplex/gstmplex.cc @@ -71,7 +71,8 @@ static void gst_mplex_loop (GstElement * element); static GstPad *gst_mplex_request_new_pad (GstElement * element, GstPadTemplate * templ, const gchar * name); -static GstElementStateReturn gst_mplex_change_state (GstElement * element); +static GstStateChangeReturn gst_mplex_change_state (GstElement * element, + GstStateChange transition); static void gst_mplex_get_property (GObject * object, guint prop_id, GValue * value, GParamSpec * pspec); @@ -338,13 +339,13 @@ gst_mplex_set_property (GObject * object, GST_MPLEX (object)->job->setProperty (prop_id, value); } -static GstElementStateReturn -gst_mplex_change_state (GstElement * element) +static GstStateChangeReturn +gst_mplex_change_state (GstElement * element, GstStateChange transition) { GstMplex *mplex = GST_MPLEX (element); - switch (GST_STATE_TRANSITION (element)) { - case GST_STATE_PAUSED_TO_READY: + switch (transition) { + case GST_STATE_CHANGE_PAUSED_TO_READY: delete mplex->mux; mplex->mux = NULL; mplex->num_apads = 0; @@ -355,9 +356,9 @@ gst_mplex_change_state (GstElement * element) } if (parent_class->change_state) - return parent_class->change_state (element); + return parent_class->change_state (element, transition); - return GST_STATE_SUCCESS; + return GST_STATE_CHANGE_SUCCESS; } static gboolean |