All plugins updated for element state changes.

Original commit message from CVS:
2005-09-02  Andy Wingo  <wingo@pobox.com>

* All plugins updated for element state changes.

diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
index e0bdd413ad1a154ed861f6558d27cb0ef7550599..76453785f174e6159ad57b60e5c435095fadb123 100644 (file)
--- a/examples/gstplay/player.c
+++ b/examples/gstplay/player.c
@@ -158,7 +158,7 @@ main (int argc, char *argv[])
 
   /* Change state to PLAYING */
   if (gst_element_set_state (GST_ELEMENT (play),
-          GST_STATE_PLAYING) == GST_STATE_FAILURE)
+          GST_STATE_PLAYING) == GST_STATE_CHANGE_FAILURE)
     g_error ("Could not set state to PLAYING");
 
   g_timeout_add (20000, (GSourceFunc) seek_timer, play);

diff --git a/examples/stats/mp2ogg.c b/examples/stats/mp2ogg.c
index f62fe5d4729ec476679b9248f18b123adb434e57..d39323cab0ce79fd661fca52c9511e2f64e02f25 100644 (file)
--- a/examples/stats/mp2ogg.c
+++ b/examples/stats/mp2ogg.c
@@ -59,7 +59,8 @@ main (gint argc, gchar * argv[])
   dec_sink = gst_element_get_pad (decoder, "sink");
   enc_src = gst_element_get_pad (encoder, "src");
 
-  if (gst_element_set_state (pipeline, GST_STATE_PLAYING) != GST_STATE_SUCCESS) {
+  if (gst_element_set_state (pipeline,
+          GST_STATE_PLAYING) != GST_STATE_CHANGE_SUCCESS) {
     g_print ("pipeline doesn't want to play\n");
     return -1;
   }

diff --git a/ext/a52dec/gsta52dec.c b/ext/a52dec/gsta52dec.c
index 89496bae961da30e0710e4e37708005840c03f35..88fe9e99e5b489237a503536dc59a9e6e05b967f 100644 (file)
--- a/ext/a52dec/gsta52dec.c
+++ b/ext/a52dec/gsta52dec.c
@@ -84,7 +84,8 @@ static void gst_a52dec_class_init (GstA52DecClass * klass);
 static void gst_a52dec_init (GstA52Dec * a52dec);
 
 static void gst_a52dec_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_a52dec_change_state (GstElement * element);
+static GstStateChangeReturn gst_a52dec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_a52dec_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -498,15 +499,15 @@ gst_a52dec_chain (GstPad * pad, GstData * _data)
   gst_buffer_unref (buf);
 }
 
-static GstElementStateReturn
-gst_a52dec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_a52dec_change_state (GstElement * element, GstStateChange transition)
 {
   GstA52Dec *a52dec = GST_A52DEC (element);
   GstCPUFlags cpuflags;
   uint32_t a52_cpuflags = 0;
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       cpuflags = gst_cpu_get_flags ();
       if (cpuflags & GST_CPU_FLAG_MMX)
         a52_cpuflags |= MM_ACCEL_X86_MMX;
@@ -517,7 +518,7 @@ gst_a52dec_change_state (GstElement * element)
 
       a52dec->state = a52_init (a52_cpuflags);
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       a52dec->samples = a52_samples (a52dec->state);
       a52dec->bit_rate = -1;
       a52dec->sample_rate = -1;
@@ -528,18 +529,18 @@ gst_a52dec_change_state (GstElement * element)
       a52dec->bias = 0;
       a52dec->time = 0;
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       a52dec->samples = NULL;
       if (a52dec->cache) {
         gst_buffer_unref (a52dec->cache);
         a52dec->cache = NULL;
       }
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       a52_free (a52dec->state);
       a52dec->state = NULL;
       break;
@@ -548,9 +549,9 @@ gst_a52dec_change_state (GstElement * element)
 
   }
 
-  GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 static void

diff --git a/ext/amrnb/amrnbdec.c b/ext/amrnb/amrnbdec.c
index 7bf02849b9278dc12c8accb8dd203f2aef8aa1f4..9f9ea4e17dffa75e956cda04b288fc06f62b7c6b 100644 (file)
--- a/ext/amrnb/amrnbdec.c
+++ b/ext/amrnb/amrnbdec.c
@@ -50,7 +50,7 @@ static void gst_amrnbdec_init (GstAmrnbDec * amrnbdec);
 
 static GstFlowReturn gst_amrnbdec_chain (GstPad * pad, GstBuffer * buffer);
 static gboolean gst_amrnbdec_setcaps (GstPad * pad, GstCaps * caps);
-static GstElementStateReturn gst_amrnbdec_state_change (GstElement * element);
+static GstStateChangeReturn gst_amrnbdec_state_change (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -225,22 +225,20 @@ not_negotiated:
   }
 }
 
-static GstElementStateReturn
+static GstStateChangeReturn
 gst_amrnbdec_state_change (GstElement * element)
 {
   GstAmrnbDec *amrnbdec;
-  GstElementStateReturn ret;
-  gint transition;
+  GstStateChangeReturn ret;
 
   amrnbdec = GST_AMRNBDEC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!(amrnbdec->handle = Decoder_Interface_init ()))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       gst_adapter_clear (amrnbdec->adapter);
       amrnbdec->ts = 0;
       break;
@@ -248,10 +246,10 @@ gst_amrnbdec_state_change (GstElement * element)
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       Decoder_Interface_exit (amrnbdec->handle);
       break;
     default:

diff --git a/ext/amrnb/amrnbenc.c b/ext/amrnb/amrnbenc.c
index 40632557f1a0aa3dde295381a3e2879d150f6cb4..ece0e07c648748e33d01f24dca2165a487a14cd9 100644 (file)
--- a/ext/amrnb/amrnbenc.c
+++ b/ext/amrnb/amrnbenc.c
@@ -47,7 +47,7 @@ static void gst_amrnbenc_finalize (GObject * object);
 
 static GstFlowReturn gst_amrnbenc_chain (GstPad * pad, GstBuffer * buffer);
 static gboolean gst_amrnbenc_setcaps (GstPad * pad, GstCaps * caps);
-static GstElementStateReturn gst_amrnbenc_state_change (GstElement * element);
+static GstStateChangeReturn gst_amrnbenc_state_change (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -236,22 +236,20 @@ not_negotiated:
   }
 }
 
-static GstElementStateReturn
+static GstStateChangeReturn
 gst_amrnbenc_state_change (GstElement * element)
 {
   GstAmrnbEnc *amrnbenc;
-  GstElementStateReturn ret;
-  gint transition;
+  GstStateChangeReturn ret;
 
   amrnbenc = GST_AMRNBENC (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!(amrnbenc->handle = Encoder_Interface_init (0)))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       amrnbenc->ts = 0;
       gst_adapter_clear (amrnbenc->adapter);
       break;
@@ -259,10 +257,10 @@ gst_amrnbenc_state_change (GstElement * element)
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       Encoder_Interface_exit (amrnbenc->handle);
       break;
     default:

diff --git a/ext/amrnb/amrnbparse.c b/ext/amrnb/amrnbparse.c
index 41cdfca0d913a864ba39f1b3fcbb9df945b77150..35583ccfa669a08a514c9c43298d2133faa6c08f 100644 (file)
--- a/ext/amrnb/amrnbparse.c
+++ b/ext/amrnb/amrnbparse.c
@@ -56,7 +56,7 @@ static gboolean gst_amrnbparse_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_amrnbparse_chain (GstPad * pad, GstBuffer * buffer);
 static void gst_amrnbparse_loop (GstPad * pad);
 static gboolean gst_amrnbparse_sink_activate (GstPad * sinkpad);
-static GstElementStateReturn gst_amrnbparse_state_change (GstElement * element);
+static GstStateChangeReturn gst_amrnbparse_state_change (GstElement * element);
 
 static GstElementClass *parent_class = NULL;
 
@@ -472,31 +472,29 @@ gst_amrnbparse_sink_activate (GstPad * sinkpad)
   return result;
 }
 
-static GstElementStateReturn
+static GstStateChangeReturn
 gst_amrnbparse_state_change (GstElement * element)
 {
   GstAmrnbParse *amrnbparse;
-  gint transition;
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
 
   amrnbparse = GST_AMRNBPARSE (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       break;
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;

diff --git a/ext/dvdnav/dvdnavsrc.c b/ext/dvdnav/dvdnavsrc.c
index 1ac09870437aac4fc95a82e1ec61d70728e8989d..86bc64f8770990d3a6e3ee04bbabda0036033329 100644 (file)
--- a/ext/dvdnav/dvdnavsrc.c
+++ b/ext/dvdnav/dvdnavsrc.c
@@ -250,7 +250,8 @@ static void dvdnavsrc_update_streaminfo (DVDNavSrc * src);
 static void dvdnavsrc_set_domain (DVDNavSrc * src);
 static void dvdnavsrc_update_highlight (DVDNavSrc * src);
 static void dvdnavsrc_user_op (DVDNavSrc * src, int op);
-static GstElementStateReturn dvdnavsrc_change_state (GstElement * element);
+static GstStateChangeReturn dvdnavsrc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void dvdnavsrc_uri_handler_init (gpointer g_iface, gpointer iface_data);
 
@@ -1582,47 +1583,47 @@ dvdnavsrc_close (DVDNavSrc * src)
   return TRUE;
 }
 
-static GstElementStateReturn
-dvdnavsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+dvdnavsrc_change_state (GstElement * element, GstStateChange transition)
 {
   DVDNavSrc *src;
 
-  g_return_val_if_fail (GST_IS_DVDNAVSRC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_DVDNAVSRC (element), GST_STATE_CHANGE_FAILURE);
 
   src = DVDNAVSRC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       if (!dvdnavsrc_is_open (src)) {
         if (!dvdnavsrc_open (src)) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
       }
       src->streaminfo = NULL;
       src->need_newmedia = TRUE;
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (dvdnavsrc_is_open (src)) {
         if (!dvdnavsrc_close (src)) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
       }
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
   }
 
   /* if we haven't failed already, give the parent class a chance to ;-) */
   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 const GstEventMask *

diff --git a/ext/dvdread/dvdreadsrc.c b/ext/dvdread/dvdreadsrc.c
index 2bb0f0d507e8fb258b6dd84452ec4a8656c1a14a..dbeb933122c7ad1c72f520f034d375eb6fe346b2 100644 (file)
--- a/ext/dvdread/dvdreadsrc.c
+++ b/ext/dvdread/dvdreadsrc.c
@@ -122,7 +122,8 @@ static gboolean dvdreadsrc_srcpad_query (GstPad * pad, GstQueryType type,
     GstFormat * format, gint64 * value);
 
 static GstData *dvdreadsrc_get (GstPad * pad);
-static GstElementStateReturn dvdreadsrc_change_state (GstElement * element);
+static GstStateChangeReturn dvdreadsrc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void dvdreadsrc_uri_handler_init (gpointer g_iface, gpointer iface_data);
 
@@ -1080,22 +1081,22 @@ dvdreadsrc_close_file (DVDReadSrc * src)
   GST_FLAG_UNSET (src, DVDREADSRC_OPEN);
 }
 
-static GstElementStateReturn
-dvdreadsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+dvdreadsrc_change_state (GstElement * element, GstStateChange transition)
 {
   DVDReadSrc *dvdreadsrc = DVDREADSRC (element);
 
-  g_return_val_if_fail (GST_IS_DVDREADSRC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_DVDREADSRC (element), GST_STATE_CHANGE_FAILURE);
 
   GST_DEBUG ("gstdvdreadsrc: state pending %d", GST_STATE_PENDING (element));
 
   /* if going down into NULL state, close the file if it's open */
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!dvdreadsrc_open_file (DVDREADSRC (element)))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       dvdreadsrc->priv->new_cell = TRUE;
       dvdreadsrc->priv->new_seek = TRUE;
       dvdreadsrc->priv->chapter = 0;
@@ -1104,7 +1105,7 @@ dvdreadsrc_change_state (GstElement * element)
       dvdreadsrc->priv->seek_pend = FALSE;
       dvdreadsrc->priv->seek_pend_fmt = GST_FORMAT_UNDEFINED;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       dvdreadsrc_close_file (DVDREADSRC (element));
       break;
     default:
@@ -1113,9 +1114,9 @@ dvdreadsrc_change_state (GstElement * element)
 
   /* if we haven't failed already, give the parent class a chance to ;-) */
   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/ext/lame/gstlame.c b/ext/lame/gstlame.c
index 5519d6001f6281bb6ede08d649ccc0b83f33bcf5..02a04deaaf6bcd050e82f5f457a9f89979bb3c42 100644 (file)
--- a/ext/lame/gstlame.c
+++ b/ext/lame/gstlame.c
@@ -233,7 +233,8 @@ static void gst_lame_get_property (GObject * object, guint prop_id,
 static gboolean gst_lame_sink_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_lame_chain (GstPad * pad, GstBuffer * buf);
 static gboolean gst_lame_setup (GstLame * lame);
-static GstElementStateReturn gst_lame_change_state (GstElement * element);
+static GstStateChangeReturn gst_lame_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -1199,19 +1200,17 @@ gst_lame_setup (GstLame * lame)
 #undef CHECK_ERROR
 }
 
-static GstElementStateReturn
-gst_lame_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_lame_change_state (GstElement * element, GstStateChange transition)
 {
   GstLame *lame;
-  gint transition;
-  GstElementStateReturn result;
+  GstStateChangeReturn result;
 
   lame = GST_LAME (element);
 
-  transition = GST_STATE_TRANSITION (lame);
 
   switch (transition) {
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       lame->last_ts = GST_CLOCK_TIME_NONE;
       break;
     default:
@@ -1219,10 +1218,10 @@ gst_lame_change_state (GstElement * element)
   }
 
   /* if we haven't failed already, give the parent class a chance to ;-) */
-  result = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (lame->initialized) {
         lame_close (lame->lgf);
         lame->lgf = lame_init ();

diff --git a/ext/mad/gstid3tag.c b/ext/mad/gstid3tag.c
index c2fffd2d1014167b2a4eed67bc11babb13bf19da..3a93565abef79a8a36eec6f21826be1caa11fe24 100644 (file)
--- a/ext/mad/gstid3tag.c
+++ b/ext/mad/gstid3tag.c
@@ -169,7 +169,8 @@ static gboolean gst_id3_tag_sink_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer);
 static GstPadLinkReturn gst_id3_tag_src_link (GstPad * pad, GstPad * peer);
 
-static GstElementStateReturn gst_id3_tag_change_state (GstElement * element);
+static GstStateChangeReturn gst_id3_tag_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -1302,16 +1303,16 @@ gst_id3_tag_chain (GstPad * pad, GstBuffer * buffer)
   return GST_FLOW_OK;
 }
 
-static GstElementStateReturn
-gst_id3_tag_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_id3_tag_change_state (GstElement * element, GstStateChange transition)
 {
   GstID3Tag *tag;
-  GstElementStateReturn ret = GST_STATE_SUCCESS;
+  GstStateChangeReturn ret = GST_STATE_CHANGE_SUCCESS;
 
   tag = GST_ID3_TAG (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       g_assert (tag->parsed_tags == NULL);
       g_assert (tag->buffer == NULL);
       tag->v1tag_size = 0;
@@ -1327,10 +1328,10 @@ gst_id3_tag_change_state (GstElement * element)
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (tag->parsed_tags) {
         gst_tag_list_free (tag->parsed_tags);
         tag->parsed_tags = NULL;

diff --git a/ext/mad/gstmad.c b/ext/mad/gstmad.c
index 4eebf031d17fb17b1f98649331591fa2c279188a..681bd806a0a02178bec6ad001c543a85f84c2d87 100644 (file)
--- a/ext/mad/gstmad.c
+++ b/ext/mad/gstmad.c
@@ -170,7 +170,8 @@ static gboolean gst_mad_convert_src (GstPad * pad, GstFormat src_format,
 static gboolean gst_mad_sink_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_mad_chain (GstPad * pad, GstBuffer * buffer);
 
-static GstElementStateReturn gst_mad_change_state (GstElement * element);
+static GstStateChangeReturn gst_mad_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_mad_set_index (GstElement * element, GstIndex * index);
 static GstIndex *gst_mad_get_index (GstElement * element);
@@ -1548,20 +1549,18 @@ end:
   return result;
 }
 
-static GstElementStateReturn
-gst_mad_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mad_change_state (GstElement * element, GstStateChange transition)
 {
   GstMad *mad;
-  GstElementStateReturn ret;
-  gint transition;
+  GstStateChangeReturn ret;
 
   mad = GST_MAD (element);
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
     {
       guint options = 0;
 
@@ -1588,18 +1587,18 @@ gst_mad_change_state (GstElement * element)
       mad_stream_options (&mad->stream, options);
       break;
     }
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
     default:
       break;
   }
 
-  ret = parent_class->change_state (element);
+  ret = parent_class->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       mad_synth_finish (&mad->synth);
       mad_frame_finish (&mad->frame);
       mad_stream_finish (&mad->stream);
@@ -1609,7 +1608,7 @@ gst_mad_change_state (GstElement * element)
         mad->tags = NULL;
       }
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;

diff --git a/ext/mpeg2dec/gstmpeg2dec.c b/ext/mpeg2dec/gstmpeg2dec.c
index 5deb90d417b63af3f105a6388b8d26a62b950c0d..ee300a3444705065f23fc9b600e20c06d57e328a 100644 (file)
--- a/ext/mpeg2dec/gstmpeg2dec.c
+++ b/ext/mpeg2dec/gstmpeg2dec.c
@@ -168,7 +168,8 @@ static gboolean gst_mpeg2dec_sink_convert (GstPad * pad, GstFormat src_format,
 static gboolean gst_mpeg2dec_src_convert (GstPad * pad, GstFormat src_format,
     gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
 
-static GstElementStateReturn gst_mpeg2dec_change_state (GstElement * element);
+static GstStateChangeReturn gst_mpeg2dec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static gboolean gst_mpeg2dec_sink_event (GstPad * pad, GstEvent * event);
 static GstFlowReturn gst_mpeg2dec_chain (GstPad * pad, GstBuffer * buf);
@@ -1668,33 +1669,33 @@ gst_mpeg2dec_src_event (GstPad * pad, GstEvent * event)
   return res;
 }
 
-static GstElementStateReturn
-gst_mpeg2dec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mpeg2dec_change_state (GstElement * element, GstStateChange transition)
 {
-  GstElementStateReturn ret;
+  GstStateChangeReturn ret;
   GstMpeg2dec *mpeg2dec = GST_MPEG2DEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       mpeg2dec->next_time = 0;
       gst_mpeg2dec_reset (mpeg2dec);
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
     default:
       break;
   }
 
-  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  ret = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PLAYING_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_mpeg2dec_close_decoder (mpeg2dec);
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;

diff --git a/gst/ac3parse/gstac3parse.c b/gst/ac3parse/gstac3parse.c
index bc237b850f4cc64535b70b54852a35a582c67f05..b58d817b7a5107e880eb10a1bb4ce6de81d87c94 100644 (file)
--- a/gst/ac3parse/gstac3parse.c
+++ b/gst/ac3parse/gstac3parse.c
@@ -120,7 +120,8 @@ static void gst_ac3parse_set_property (GObject * object,
 static void gst_ac3parse_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_ac3parse_change_state (GstElement * element);
+static GstStateChangeReturn gst_ac3parse_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -413,22 +414,22 @@ gst_ac3parse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_ac3parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_ac3parse_change_state (GstElement * element, GstStateChange transition)
 {
   GstAc3Parse *ac3parse = GST_AC3PARSE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       /* reset stream info */
       ac3parse->channels = ac3parse->sample_rate = -1;
       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

diff --git a/gst/asfdemux/gstasfdemux.c b/gst/asfdemux/gstasfdemux.c
index 4360de843e6445c282d8872d33c96dcbb4f7a5ac..e3885e43aa1150345d44bb453f31aa571941802a 100644 (file)
--- a/gst/asfdemux/gstasfdemux.c
+++ b/gst/asfdemux/gstasfdemux.c
@@ -68,7 +68,8 @@ static gboolean gst_asf_demux_add_audio_stream (GstASFDemux * asf_demux,
 static gboolean gst_asf_demux_setup_pad (GstASFDemux * asf_demux,
     GstPad * src_pad, GstCaps * caps, guint16 id);
 
-static GstElementStateReturn gst_asf_demux_change_state (GstElement * element);
+static GstStateChangeReturn gst_asf_demux_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstPadTemplate *videosrctempl, *audiosrctempl;
 static GstElementClass *parent_class = NULL;
@@ -1668,18 +1669,18 @@ gst_asf_demux_get_property (GObject * object,
   }
 }
 
-static GstElementStateReturn
-gst_asf_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_asf_demux_change_state (GstElement * element, GstStateChange transition)
 {
   GstASFDemux *asf_demux = GST_ASF_DEMUX (element);
   gint i;
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       asf_demux->bs = gst_bytestream_new (asf_demux->sinkpad);
       asf_demux->last_seek = 0;
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_bytestream_destroy (asf_demux->bs);
       for (i = 0; i < GST_ASF_DEMUX_NUM_VIDEO_PADS; i++) {
         asf_demux->video_PTS[i] = 0;
@@ -1695,13 +1696,13 @@ gst_asf_demux_change_state (GstElement * element)
       asf_demux->seek_pending = GST_CLOCK_TIME_NONE;
       asf_demux->seek_discont = FALSE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 static guint32

diff --git a/gst/asfdemux/gstasfmux.c b/gst/asfdemux/gstasfmux.c
index 69980c054a8239e966330a378eee17d8adec373a..2fa55abaea1c068c11dd1cf46993ac3ea982a7e7 100644 (file)
--- a/gst/asfdemux/gstasfmux.c
+++ b/gst/asfdemux/gstasfmux.c
@@ -161,7 +161,8 @@ static void gst_asfmux_loop (GstElement * element);
 static gboolean gst_asfmux_handle_event (GstPad * pad, GstEvent * event);
 static GstPad *gst_asfmux_request_new_pad (GstElement * element,
     GstPadTemplate * templ, const gchar * name);
-static GstElementStateReturn gst_asfmux_change_state (GstElement * element);
+static GstStateChangeReturn gst_asfmux_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -1272,18 +1273,17 @@ gst_asfmux_loop (GstElement * element)
   gst_asfmux_do_one_buffer (asfmux);
 }
 
-static GstElementStateReturn
-gst_asfmux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_asfmux_change_state (GstElement * element, GstStateChange transition)
 {
   GstAsfMux *asfmux;
-  gint transition = GST_STATE_TRANSITION (element), n;
 
-  g_return_val_if_fail (GST_IS_ASFMUX (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_ASFMUX (element), GST_STATE_CHANGE_FAILURE);
 
   asfmux = GST_ASFMUX (element);
 
   switch (transition) {
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       for (n = 0; n < asfmux->num_outputs; n++) {
         asfmux->output[n].eos = FALSE;
       }
@@ -1291,7 +1291,7 @@ gst_asfmux_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/dvdlpcmdec/gstdvdlpcmdec.c b/gst/dvdlpcmdec/gstdvdlpcmdec.c
index 7498646e2ad2a273ef3df0524845a0bdd2ddf51b..f0dfc4336f1302534b98571899a967299d3e335d 100644 (file)
--- a/gst/dvdlpcmdec/gstdvdlpcmdec.c
+++ b/gst/dvdlpcmdec/gstdvdlpcmdec.c
@@ -86,7 +86,8 @@ static GstFlowReturn gst_dvdlpcmdec_chain_dvd (GstPad * pad,
     GstBuffer * buffer);
 static gboolean gst_dvdlpcmdec_setcaps (GstPad * pad, GstCaps * caps);
 
-static GstElementStateReturn gst_dvdlpcmdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_dvdlpcmdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -584,23 +585,23 @@ invalid_width:
   }
 }
 
-static GstElementStateReturn
-gst_dvdlpcmdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_dvdlpcmdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstDvdLpcmDec *dvdlpcmdec = GST_DVDLPCMDEC (element);
-  GstElementStateReturn res;
+  GstStateChangeReturn res;
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       gst_dvdlpcm_reset (dvdlpcmdec);
       break;
     default:
       break;
   }
 
-  res = parent_class->change_state (element);
+  res = parent_class->change_state (element, transition);
 
-  switch (GST_STATE_TRANSITION (element)) {
+  switch (transition) {
     default:
       break;
   }

diff --git a/gst/iec958/ac3iec.c b/gst/iec958/ac3iec.c
index a1404946cf5ec17100d0c7c92cc353109744ecf4..35573e2f9951df88cac57180e81ae4cf7d08e9b6 100644 (file)
--- a/gst/iec958/ac3iec.c
+++ b/gst/iec958/ac3iec.c
@@ -98,7 +98,8 @@ static GstFlowReturn ac3iec_chain_dvd (GstPad * pad, GstBuffer * buf);
 static GstFlowReturn ac3iec_chain_raw (GstPad * pad, GstBuffer * buf);
 static gboolean ac3iec_setcaps (GstPad * pad, GstCaps * caps);
 
-static GstElementStateReturn ac3iec_change_state (GstElement * element);
+static GstStateChangeReturn ac3iec_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -363,36 +364,36 @@ buffer_alloc_failed:
 }
 
 
-static GstElementStateReturn
-ac3iec_change_state (GstElement * element)
+static GstStateChangeReturn
+ac3iec_change_state (GstElement * element, GstStateChange transition)
 {
   AC3IEC *ac3iec;
 
-  g_return_val_if_fail (GST_IS_AC3IEC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_AC3IEC (element), GST_STATE_CHANGE_FAILURE);
 
   ac3iec = AC3IEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       ac3p_init (ac3iec->padder);
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    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;
 }
 
 

diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 7143c3395e41d7aa1dcaa6e66b5780221fa28eed..082135291f27a7b966495a125c77629b0805ed2e 100644 (file)
--- a/gst/mpegaudioparse/gstmpegaudioparse.c
+++ b/gst/mpegaudioparse/gstmpegaudioparse.c
@@ -75,7 +75,8 @@ static void gst_mp3parse_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_mp3parse_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_mp3parse_change_state (GstElement * element);
+static GstStateChangeReturn gst_mp3parse_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -529,16 +530,16 @@ gst_mp3parse_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_mp3parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mp3parse_change_state (GstElement * element, GstStateChange transition)
 {
   GstMPEGAudioParse *src;
-  GstElementStateReturn result;
+  GstStateChangeReturn result;
 
   src = GST_MP3PARSE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       src->channels = -1;
       src->rate = -1;
       src->layer = -1;
@@ -547,7 +548,7 @@ gst_mp3parse_change_state (GstElement * element)
       break;
   }
 
-  result = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  result = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   return result;
 }

diff --git a/gst/mpegstream/gstdvddemux.c b/gst/mpegstream/gstdvddemux.c
index 5ca52363905abb48c0a004bb3c2cf5135cb9c44e..0ebc8fa0731629da4f1bc2edd3d2293de0d91abc 100644 (file)
--- a/gst/mpegstream/gstdvddemux.c
+++ b/gst/mpegstream/gstdvddemux.c
@@ -169,7 +169,8 @@ static void gst_dvd_demux_set_cur_subpicture
 static void gst_dvd_demux_reset (GstDVDDemux * dvd_demux);
 
 
-static GstElementStateReturn gst_dvd_demux_change_state (GstElement * element);
+static GstStateChangeReturn gst_dvd_demux_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstMPEGDemuxClass *parent_class = NULL;
 
@@ -1043,20 +1044,20 @@ gst_dvd_demux_reset (GstDVDDemux * dvd_demux)
   dvd_demux->discont_time = GST_CLOCK_TIME_NONE;
 }
 
-static GstElementStateReturn
-gst_dvd_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_dvd_demux_change_state (GstElement * element, GstStateChange transition)
 {
   GstDVDDemux *dvd_demux = GST_DVD_DEMUX (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_dvd_demux_reset (dvd_demux);
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 gboolean

diff --git a/gst/mpegstream/gstmpegdemux.c b/gst/mpegstream/gstmpegdemux.c
index 4be7d457dd25ab895fd884346b115ba6f0bee3f8..c64740f020088db6dc24bdb81aa3d87843d42f9e 100644 (file)
--- a/gst/mpegstream/gstmpegdemux.c
+++ b/gst/mpegstream/gstmpegdemux.c
@@ -136,7 +136,8 @@ static gboolean gst_mpeg_demux_handle_src_event (GstPad * pad,
 static void gst_mpeg_demux_reset (GstMPEGDemux * mpeg_demux);
 
 
-static GstElementStateReturn gst_mpeg_demux_change_state (GstElement * element);
+static GstStateChangeReturn gst_mpeg_demux_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_mpeg_demux_set_index (GstElement * element, GstIndex * index);
 static GstIndex *gst_mpeg_demux_get_index (GstElement * element);
@@ -1119,20 +1120,20 @@ gst_mpeg_demux_reset (GstMPEGDemux * mpeg_demux)
 
 }
 
-static GstElementStateReturn
-gst_mpeg_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mpeg_demux_change_state (GstElement * element, GstStateChange transition)
 {
   GstMPEGDemux *mpeg_demux = GST_MPEG_DEMUX (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_mpeg_demux_reset (mpeg_demux);
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 static void

diff --git a/gst/mpegstream/gstmpegparse.c b/gst/mpegstream/gstmpegparse.c
index 4b07d0e5da9bec82134ae7e299e28b1a78b92051..39bc8fa700a2dd39d3d7db4b74bea91fe865bc6b 100644 (file)
--- a/gst/mpegstream/gstmpegparse.c
+++ b/gst/mpegstream/gstmpegparse.c
@@ -87,7 +87,8 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
 static void gst_mpeg_parse_class_init (GstMPEGParseClass * klass);
 static void gst_mpeg_parse_base_init (GstMPEGParseClass * klass);
 static void gst_mpeg_parse_init (GstMPEGParse * mpeg_parse);
-static GstElementStateReturn gst_mpeg_parse_change_state (GstElement * element);
+static GstStateChangeReturn gst_mpeg_parse_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_mpeg_parse_set_clock (GstElement * element, GstClock * clock);
 
@@ -1017,13 +1018,13 @@ gst_mpeg_parse_handle_src_event (GstPad * pad, GstEvent * event)
   return res;
 }
 
-static GstElementStateReturn
-gst_mpeg_parse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mpeg_parse_change_state (GstElement * element, GstStateChange transition)
 {
   GstMPEGParse *mpeg_parse = GST_MPEG_PARSE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       if (!mpeg_parse->packetize) {
         mpeg_parse->packetize =
             gst_mpeg_packetize_new (mpeg_parse->sinkpad,
@@ -1032,7 +1033,7 @@ gst_mpeg_parse_change_state (GstElement * element)
       /* initialize parser state */
       gst_mpeg_parse_reset (mpeg_parse);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (mpeg_parse->packetize) {
         gst_mpeg_packetize_destroy (mpeg_parse->packetize);
         mpeg_parse->packetize = NULL;
@@ -1043,7 +1044,7 @@ gst_mpeg_parse_change_state (GstElement * element)
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 static void

diff --git a/gst/mpegstream/gstrfc2250enc.c b/gst/mpegstream/gstrfc2250enc.c
index a50e1347ac4c9896e2573949ef9168055a4507b8..76b08cc826304082ad92ba86f4d2aaebafd23eec 100644 (file)
--- a/gst/mpegstream/gstrfc2250enc.c
+++ b/gst/mpegstream/gstrfc2250enc.c
@@ -66,8 +66,8 @@ static GstStaticPadTemplate src_factory = GST_STATIC_PAD_TEMPLATE ("src",
 static void gst_rfc2250_enc_class_init (GstRFC2250EncClass * klass);
 static void gst_rfc2250_enc_base_init (GstRFC2250EncClass * klass);
 static void gst_rfc2250_enc_init (GstRFC2250Enc * rfc2250_enc);
-static GstElementStateReturn
-gst_rfc2250_enc_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition);
 
 static void gst_rfc2250_enc_loop (GstElement * element);
 
@@ -294,20 +294,20 @@ gst_rfc2250_enc_loop (GstElement * element)
   }
 }
 
-static GstElementStateReturn
-gst_rfc2250_enc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rfc2250_enc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRFC2250Enc *rfc2250_enc = GST_RFC2250_ENC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!rfc2250_enc->packetize) {
         rfc2250_enc->packetize =
             gst_mpeg_packetize_new (rfc2250_enc->sinkpad,
             GST_MPEG_PACKETIZE_VIDEO);
       }
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       if (rfc2250_enc->packetize) {
         gst_mpeg_packetize_destroy (rfc2250_enc->packetize);
         rfc2250_enc->packetize = NULL;
@@ -317,9 +317,9 @@ gst_rfc2250_enc_change_state (GstElement * element)
       break;
   }
 
-  GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 static void

diff --git a/gst/realmedia/rmdemux.c b/gst/realmedia/rmdemux.c
index 230881a3916eb7336302480f8470dada06b4ef41..43cb265589afd7f7b3fb794c1455966f1253f1d4 100644 (file)
--- a/gst/realmedia/rmdemux.c
+++ b/gst/realmedia/rmdemux.c
@@ -115,7 +115,8 @@ static void gst_rmdemux_class_init (GstRMDemuxClass * klass);
 static void gst_rmdemux_base_init (GstRMDemuxClass * klass);
 static void gst_rmdemux_init (GstRMDemux * rmdemux);
 static void gst_rmdemux_dispose (GObject * object);
-static GstElementStateReturn gst_rmdemux_change_state (GstElement * element);
+static GstStateChangeReturn gst_rmdemux_change_state (GstElement * element,
+    GstStateChange transition);
 static GstFlowReturn gst_rmdemux_chain (GstPad * pad, GstBuffer * buffer);
 static void gst_rmdemux_loop (GstPad * pad);
 static gboolean gst_rmdemux_sink_activate (GstPad * sinkpad);
@@ -487,19 +488,17 @@ gst_rmdemux_src_query_types (GstPad * pad)
   return query_types;
 }
 
-static GstElementStateReturn
-gst_rmdemux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rmdemux_change_state (GstElement * element, GstStateChange transition)
 {
   GstRMDemux *rmdemux = GST_RMDEMUX (element);
-  gint transition;
-  GstElementStateReturn res;
+  GstStateChangeReturn res;
 
-  transition = GST_STATE_TRANSITION (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       rmdemux->state = RMDEMUX_STATE_HEADER;
       rmdemux->have_pads = FALSE;
       rmdemux->segment_start = GST_CLOCK_TIME_NONE;
@@ -507,22 +506,24 @@ gst_rmdemux_change_state (GstElement * element)
       rmdemux->segment_play = FALSE;
       rmdemux->running = FALSE;
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+      break;
+    default:
       break;
   }
 
-  res = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  res = GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 
   switch (transition) {
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_adapter_clear (rmdemux->adapter);
       GST_LOCK (rmdemux);
       rmdemux->running = FALSE;
       GST_UNLOCK (rmdemux);
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;

diff --git a/gst/synaesthesia/gstsynaesthesia.c b/gst/synaesthesia/gstsynaesthesia.c
index 3b829ff1e62c08b8ce81329f7639c3ee3a0671bf..7aa281fb833317ae0dbb97166bb42ffe9ed79a61 100644 (file)
--- a/gst/synaesthesia/gstsynaesthesia.c
+++ b/gst/synaesthesia/gstsynaesthesia.c
@@ -109,8 +109,8 @@ static void gst_synaesthesia_dispose (GObject * object);
 
 static void gst_synaesthesia_chain (GstPad * pad, GstData * _data);
 
-static GstElementStateReturn
-gst_synaesthesia_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_synaesthesia_change_state (GstElement * element, GstStateChange transition);
 
 static GstCaps *gst_synaesthesia_src_getcaps (GstPad * pad);
 static GstPadLinkReturn
@@ -395,24 +395,24 @@ gst_synaesthesia_chain (GstPad * pad, GstData * _data)
   }
 }
 
-static GstElementStateReturn
-gst_synaesthesia_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_synaesthesia_change_state (GstElement * element, GstStateChange transition)
 {
   GstSynaesthesia *synaesthesia;
 
   synaesthesia = GST_SYNAESTHESIA (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       synaesthesia->audio_basetime = GST_CLOCK_TIME_NONE;
       gst_adapter_clear (synaesthesia->adapter);
       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;
 }