Fix up all the state change functions.

Original commit message from CVS:
Fix up all the state change functions.

78 files changed, 961 insertions, 818 deletions

diff --git a/ChangeLog b/ChangeLog
index 47dbfe669..607b41da4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,87 @@
+2005-09-05  Jan Schmidt  <thaytan@mad.scientist.com>
+	* examples/gstplay/player.c: (main):
+	* examples/stats/mp2ogg.c: (main):
+	* ext/artsd/gstartsdsink.c: (gst_artsdsink_change_state):
+	* ext/audiofile/gstafsink.c: (gst_afsink_change_state):
+	* ext/audiofile/gstafsrc.c: (gst_afsrc_change_state):
+	* ext/cdaudio/gstcdaudio.c: (gst_cdaudio_change_state):
+	* ext/dirac/gstdiracdec.cc:
+	* ext/directfb/directfbvideosink.c:
+	(gst_directfbvideosink_change_state):
+	* ext/dts/gstdtsdec.c: (gst_dtsdec_change_state):
+	* ext/faac/gstfaac.c: (gst_faac_change_state):
+	* ext/hermes/gsthermescolorspace.c:
+	(gst_hermes_colorspace_change_state):
+	* ext/ivorbis/vorbisfile.c: (gst_ivorbisfile_change_state):
+	* ext/jack/gstjack.c: (gst_jack_change_state):
+	* ext/jack/gstjackbin.c: (gst_jack_bin_change_state):
+	* ext/lcs/gstcolorspace.c: (gst_colorspace_change_state):
+	* ext/libmms/gstmms.c: (gst_mms_change_state):
+	* ext/mpeg2enc/gstmpeg2enc.cc:
+	* ext/mplex/gstmplex.cc:
+	* ext/musepack/gstmusepackdec.c: (gst_musepackdec_change_state):
+	* ext/musicbrainz/gsttrm.c: (gst_musicbrainz_change_state):
+	* ext/nas/nassink.c: (gst_nassink_change_state):
+	* ext/polyp/polypsink.c: (gst_polypsink_change_state),
+	(context_state_callback), (gst_polypsink_link):
+	* ext/sdl/sdlvideosink.c: (gst_sdlvideosink_change_state):
+	* ext/shout/gstshout.c: (gst_icecastsend_change_state):
+	* ext/smoothwave/gstsmoothwave.c: (gst_sw_change_state):
+	* ext/sndfile/gstsf.c: (gst_sf_change_state):
+	* ext/swfdec/gstswfdec.c: (gst_swfdec_change_state):
+	* ext/tarkin/gsttarkindec.c: (gst_tarkindec_change_state):
+	* ext/xine/xine.c: (gst_xine_change_state):
+	* ext/xine/xineaudiodec.c: (gst_xine_audio_dec_change_state):
+	* ext/xine/xineaudiosink.c: (gst_xine_audio_sink_change_state):
+	* ext/xine/xineinput.c: (gst_xine_input_change_state):
+	* ext/xvid/gstxviddec.c: (gst_xviddec_change_state):
+	* ext/xvid/gstxvidenc.c: (gst_xvidenc_change_state):
+	* gst/apetag/apedemux.c: (gst_ape_demux_change_state):
+	* gst/cdxaparse/gstcdxaparse.c: (gst_cdxaparse_change_state):
+	* gst/cdxaparse/gstcdxastrip.c: (gst_cdxastrip_change_state):
+	* gst/colorspace/gstcolorspace.c: (gst_colorspace_change_state):
+	* gst/festival/gstfestival.c: (gst_festival_change_state):
+	* gst/librfb/gstrfbsrc.c: (gst_rfbsrc_change_state):
+	* gst/modplug/gstmodplug.cc:
+	* gst/mpeg1videoparse/gstmp1videoparse.c:
+	(gst_mp1videoparse_change_state):
+	* gst/mpegaudioparse/gstmpegaudioparse.c:
+	(gst_mp3parse_change_state):
+	* gst/multifilesink/gstmultifilesink.c:
+	(gst_multifilesink_change_state):
+	* gst/speed/gstspeed.c: (speed_change_state):
+	* gst/switch/gstswitch.c: (gst_switch_change_state):
+	* gst/videocrop/gstvideocrop.c: (gst_video_crop_change_state):
+	* gst/videodrop/gstvideodrop.c: (gst_videodrop_change_state):
+	* gst/y4m/gsty4mencode.c: (gst_y4mencode_change_state):
+	* po/af.po:
+	* po/az.po:
+	* po/cs.po:
+	* po/en_GB.po:
+	* po/hu.po:
+	* po/it.po:
+	* po/nb.po:
+	* po/nl.po:
+	* po/or.po:
+	* po/sq.po:
+	* po/sr.po:
+	* po/sv.po:
+	* po/uk.po:
+	* po/vi.po:
+	* sys/cdrom/gstcdplayer.c: (cdplayer_change_state):
+	* sys/dxr3/dxr3audiosink.c: (dxr3audiosink_change_state):
+	* sys/dxr3/dxr3spusink.c: (dxr3spusink_change_state):
+	* sys/dxr3/dxr3videosink.c: (dxr3videosink_change_state):
+	* sys/glsink/glimagesink.c: (gst_glimagesink_change_state):
+	* sys/qcam/gstqcamsrc.c: (gst_qcamsrc_change_state):
+	* sys/sunaudio/gstsunaudio.c: (gst_sunaudiosink_change_state):
+	* sys/sunaudio/gstsunaudiosrc.c: (gst_sunaudiosrc_change_state):
+	* sys/sunaudio/gstsunelement.c: (gst_sunaudioelement_change_state):
+	* sys/v4l2/gstv4l2element.c: (gst_v4l2element_change_state):
+	* sys/v4l2/gstv4l2src.c: (gst_v4l2src_change_state):
+	* sys/vcd/vcdsrc.c: (gst_vcdsrc_change_state):
+	  Fix up all the state change functions.
+
 2005-09-05  Thomas Vander Stichele  <thomas at apestaart dot org>
 
 	* created gst-plugins-bad
diff --git a/examples/gstplay/player.c b/examples/gstplay/player.c
index e0bdd413a..76453785f 100644
--- 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 f62fe5d47..d39323cab 100644
--- 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/artsd/gstartsdsink.c b/ext/artsd/gstartsdsink.c
index d2174a496..f3a06c6c4 100644
--- a/ext/artsd/gstartsdsink.c
+++ b/ext/artsd/gstartsdsink.c
@@ -60,7 +60,8 @@ static void gst_artsdsink_init (GstArtsdsink * artsdsink);
 
 static gboolean gst_artsdsink_open_audio (GstArtsdsink * sink);
 static void gst_artsdsink_close_audio (GstArtsdsink * sink);
-static GstElementStateReturn gst_artsdsink_change_state (GstElement * element);
+static GstStateChangeReturn gst_artsdsink_change_state (GstElement * element,
+    GstStateChange transition);
 static gboolean gst_artsdsink_sync_parms (GstArtsdsink * artsdsink);
 static GstPadLinkReturn gst_artsdsink_link (GstPad * pad, const GstCaps * caps);
 static void gst_artsdsink_chain (GstPad * pad, GstData * _data);
@@ -323,8 +324,8 @@ gst_artsdsink_close_audio (GstArtsdsink * sink)
   g_print ("artsdsink: closed connection\n");
 }
 
-static GstElementStateReturn
-gst_artsdsink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_artsdsink_change_state (GstElement * element, GstStateChange transition)
 {
   g_return_val_if_fail (GST_IS_ARTSDSINK (element), FALSE);
 
@@ -336,11 +337,11 @@ gst_artsdsink_change_state (GstElement * element)
   } else {
     if (!GST_FLAG_IS_SET (element, GST_ARTSDSINK_OPEN)) {
       if (!gst_artsdsink_open_audio (GST_ARTSDSINK (element)))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
     }
   }
 
   if (GST_ELEMENT_CLASS (parent_class)->change_state)
-    return GST_ELEMENT_CLASS (parent_class)->change_state (element);
-  return GST_STATE_SUCCESS;
+    return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+  return GST_STATE_CHANGE_SUCCESS;
 }
diff --git a/ext/audiofile/gstafsink.c b/ext/audiofile/gstafsink.c
index 262674dc9..ea331bcdf 100644
--- a/ext/audiofile/gstafsink.c
+++ b/ext/audiofile/gstafsink.c
@@ -112,7 +112,8 @@ static void gst_afsink_get_property (GObject * object, guint prop_id,
 
 static gboolean gst_afsink_handle_event (GstPad * pad, GstEvent * event);
 
-static GstElementStateReturn gst_afsink_change_state (GstElement * element);
+static GstStateChangeReturn gst_afsink_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 static guint gst_afsink_signals[LAST_SIGNAL] = { 0 };
@@ -428,10 +429,10 @@ gst_afsink_chain (GstPad * pad, GstData * _data)
   g_signal_emit (G_OBJECT (afsink), gst_afsink_signals[SIGNAL_HANDOFF], 0);
 }
 
-static GstElementStateReturn
-gst_afsink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_afsink_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_AFSINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_AFSINK (element), GST_STATE_CHANGE_FAILURE);
 
   /* if going to NULL? then close the file */
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
@@ -454,16 +455,16 @@ gst_afsink_change_state (GstElement * element)
       if (!gst_afsink_open_file (GST_AFSINK (element)))
       {
         g_print ("DEBUG: element tries to open file\n"); 
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
     }
   }
 */
 
   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;
 }
 
 /* this function was copied from sinesrc */
diff --git a/ext/audiofile/gstafsrc.c b/ext/audiofile/gstafsrc.c
index ee3244d55..109bf12b8 100644
--- a/ext/audiofile/gstafsrc.c
+++ b/ext/audiofile/gstafsrc.c
@@ -109,7 +109,8 @@ static void gst_afsrc_set_property (GObject * object, guint prop_id,
 static void gst_afsrc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_afsrc_change_state (GstElement * element);
+static GstStateChangeReturn gst_afsrc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 static guint gst_afsrc_signals[LAST_SIGNAL] = { 0 };
@@ -372,10 +373,10 @@ gst_afsrc_close_file (GstAFSrc * src)
   }
 }
 
-static GstElementStateReturn
-gst_afsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_afsrc_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_AFSRC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_AFSRC (element), GST_STATE_CHANGE_FAILURE);
 
   /* if going to NULL then close the file */
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
@@ -390,13 +391,13 @@ gst_afsrc_change_state (GstElement * element)
 /*      g_print ("DEBUG: GST_AFSRC_OPEN not set\n"); */
       if (!gst_afsrc_open_file (GST_AFSRC (element))) {
 /*        g_print ("DEBUG: element tries to open file\n"); */
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
     }
   }
 
   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/cdaudio/gstcdaudio.c b/ext/cdaudio/gstcdaudio.c
index e36bc2c28..2a28d991b 100644
--- a/ext/cdaudio/gstcdaudio.c
+++ b/ext/cdaudio/gstcdaudio.c
@@ -89,7 +89,8 @@ static void gst_cdaudio_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * spec);
 static void gst_cdaudio_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * spec);
-static GstElementStateReturn gst_cdaudio_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdaudio_change_state (GstElement * element,
+    GstStateChange transition);
 
 static const GstEventMask *gst_cdaudio_get_event_masks (GstElement * element);
 static gboolean gst_cdaudio_send_event (GstElement * element, GstEvent * event);
@@ -294,27 +295,27 @@ debug_track_info (GstCDAudio * cdaudio)
   }
 }
 
-static GstElementStateReturn
-gst_cdaudio_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdaudio_change_state (GstElement * element, GstStateChange transition)
 {
   GstCDAudio *cdaudio;
 
   cdaudio = GST_CDAUDIO (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:
       cdaudio->cd_desc = cd_init_device (cdaudio->device);
       if (cdaudio->cd_desc < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
 
       /* close tray */
       if (cd_close (cdaudio->cd_desc) < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
 
       if (cd_stat (cdaudio->cd_desc, &cdaudio->info) < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
 
       debug_track_info (cdaudio);
 
@@ -323,7 +324,7 @@ gst_cdaudio_change_state (GstElement * element)
 
       cdaudio->was_playing = FALSE;
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
     {
       gint res;
 
@@ -333,34 +334,34 @@ gst_cdaudio_change_state (GstElement * element)
         res = cd_play (cdaudio->cd_desc, 1);
 
       if (res < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
 
       cdaudio->was_playing = TRUE;
       g_timer_start (cdaudio->timer);
       break;
     }
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       if (cd_pause (cdaudio->cd_desc) < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       g_timer_stop (cdaudio->timer);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (cd_stop (cdaudio->cd_desc) < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       if (cd_finish (cdaudio->cd_desc) < 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       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 const GstEventMask *
diff --git a/ext/dirac/gstdiracdec.cc b/ext/dirac/gstdiracdec.cc
index c9f8501aa..c883fd5fb 100644
--- a/ext/dirac/gstdiracdec.cc
+++ b/ext/dirac/gstdiracdec.cc
@@ -59,7 +59,8 @@ static void gst_diracdec_init (GstDiracDec * diracdec);
 static void gst_diracdec_dispose (GObject * object);
 
 static void gst_diracdec_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_diracdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_diracdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -340,17 +341,17 @@ gst_diracdec_chain (GstPad * pad, GstData * _data)
   }
 }
 
-static GstElementStateReturn
-gst_diracdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_diracdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstDiracDec *diracdec = GST_DIRACDEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!(diracdec->decoder = dirac_decoder_init (0)))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       dirac_decoder_close (diracdec->decoder);
       diracdec->width = diracdec->height = -1;
       diracdec->fps = 0.;
@@ -360,5 +361,5 @@ gst_diracdec_change_state (GstElement * element)
       break;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
diff --git a/ext/directfb/directfbvideosink.c b/ext/directfb/directfbvideosink.c
index 327195392..2f5536f9f 100644
--- a/ext/directfb/directfbvideosink.c
+++ b/ext/directfb/directfbvideosink.c
@@ -338,17 +338,18 @@ gst_directfbvideosink_sink_link (GstPad * pad, const GstCaps * caps)
     return GST_PAD_LINK_REFUSED;
 }
 
-static GstElementStateReturn
-gst_directfbvideosink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_directfbvideosink_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstDirectFBVideoSink *directfbvideosink;
 
   directfbvideosink = GST_DIRECTFBVIDEOSINK (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:
       /* Blank surface if we have one */
       if (directfbvideosink->foreign_surface) {
         directfbvideosink->foreign_surface->Clear (directfbvideosink->
@@ -360,23 +361,23 @@ gst_directfbvideosink_change_state (GstElement * element)
       }
       directfbvideosink->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:
       directfbvideosink->framerate = 0;
       GST_VIDEOSINK_WIDTH (directfbvideosink) = 0;
       GST_VIDEOSINK_HEIGHT (directfbvideosink) = 0;
       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;
 }
 
 static void
diff --git a/ext/dts/gstdtsdec.c b/ext/dts/gstdtsdec.c
index fa7fd5d98..cf9943942 100644
--- a/ext/dts/gstdtsdec.c
+++ b/ext/dts/gstdtsdec.c
@@ -85,7 +85,8 @@ static void gst_dtsdec_class_init (GstDtsDecClass * klass);
 static void gst_dtsdec_init (GstDtsDec * dtsdec);
 
 static void gst_dtsdec_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_dtsdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_dtsdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_dtsdec_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -514,13 +515,13 @@ gst_dtsdec_chain (GstPad * pad, GstData * _data)
   gst_buffer_unref (buf);
 }
 
-static GstElementStateReturn
-gst_dtsdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_dtsdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstDtsDec *dts = GST_DTSDEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:{
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:{
       GstCPUFlags cpuflags;
       uint32_t mm_accel = 0;
 
@@ -535,7 +536,7 @@ gst_dtsdec_change_state (GstElement * element)
       dts->state = dts_init (mm_accel);
       break;
     }
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       dts->samples = dts_samples (dts->state);
       dts->bit_rate = -1;
       dts->sample_rate = -1;
@@ -547,10 +548,10 @@ gst_dtsdec_change_state (GstElement * element)
       dts->bias = 0;
       dts->current_ts = 0;
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       dts->samples = NULL;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       dts_free (dts->state);
       dts->state = NULL;
       break;
@@ -559,9 +560,9 @@ gst_dtsdec_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 void
diff --git a/ext/faac/gstfaac.c b/ext/faac/gstfaac.c
index 233021e83..fac2fd3f2 100644
--- a/ext/faac/gstfaac.c
+++ b/ext/faac/gstfaac.c
@@ -62,7 +62,8 @@ static void gst_faac_get_property (GObject * object,
 static gboolean gst_faac_sink_setcaps (GstPad * pad, GstCaps * caps);
 static gboolean gst_faac_src_setcaps (GstPad * pad, GstCaps * caps);
 static GstFlowReturn gst_faac_chain (GstPad * pad, GstBuffer * data);
-static GstElementStateReturn gst_faac_change_state (GstElement * element);
+static GstStateChangeReturn gst_faac_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -598,13 +599,13 @@ gst_faac_get_property (GObject * object,
   }
 }
 
-static GstElementStateReturn
-gst_faac_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_faac_change_state (GstElement * element, GstStateChange transition)
 {
   GstFaac *faac = GST_FAAC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (faac->handle) {
         faacEncClose (faac->handle);
         faac->handle = NULL;
@@ -623,9 +624,9 @@ gst_faac_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
diff --git a/ext/hermes/gsthermescolorspace.c b/ext/hermes/gsthermescolorspace.c
index dcfdab051..85de2e4b8 100644
--- a/ext/hermes/gsthermescolorspace.c
+++ b/ext/hermes/gsthermescolorspace.c
@@ -134,8 +134,9 @@ static void gst_hermes_colorspace_get_property (GObject * object, guint prop_id,
 static GstPadLinkReturn
 gst_hermes_colorspace_link (GstPad * pad, const GstCaps * caps);
 static void gst_hermes_colorspace_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn
-gst_hermes_colorspace_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_hermes_colorspace_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -594,23 +595,24 @@ gst_hermes_colorspace_chain (GstPad * pad, GstData * _data)
   gst_pad_push (space->srcpad, GST_DATA (outbuf));
 }
 
-static GstElementStateReturn
-gst_hermes_colorspace_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_hermes_colorspace_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstHermesColorspace *space;
 
   space = GST_HERMES_COLORSPACE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_PLAYING:
+  switch (transition) {
+    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;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
 
 static void
diff --git a/ext/ivorbis/vorbisfile.c b/ext/ivorbis/vorbisfile.c
index e1db57d2f..db2b601bf 100644
--- a/ext/ivorbis/vorbisfile.c
+++ b/ext/ivorbis/vorbisfile.c
@@ -106,8 +106,8 @@ static void gst_ivorbisfile_base_init (gpointer g_class);
 static void gst_ivorbisfile_class_init (IvorbisfileClass * klass);
 static void gst_ivorbisfile_init (Ivorbisfile * ivorbisfile);
 
-static GstElementStateReturn
-gst_ivorbisfile_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_ivorbisfile_change_state (GstElement * element, GstStateChange transition);
 
 static const GstFormat *gst_ivorbisfile_get_formats (GstPad * pad);
 static gboolean gst_ivorbisfile_src_convert (GstPad * pad,
@@ -1037,34 +1037,34 @@ done:
   return res;
 }
 
-static GstElementStateReturn
-gst_ivorbisfile_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_ivorbisfile_change_state (GstElement * element, GstStateChange transition)
 {
   Ivorbisfile *ivorbisfile = GST_IVORBISFILE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       ivorbisfile->restart = TRUE;
       ivorbisfile->bs = gst_bytestream_new (ivorbisfile->sinkpad);
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       ivorbisfile->eos = FALSE;
-    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:
       ov_clear (&ivorbisfile->vf);
       gst_bytestream_destroy (ivorbisfile->bs);
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
     default:
       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 void
diff --git a/ext/jack/gstjack.c b/ext/jack/gstjack.c
index 58678f871..4ea178de0 100644
--- a/ext/jack/gstjack.c
+++ b/ext/jack/gstjack.c
@@ -76,7 +76,8 @@ static GstPadTemplate *gst_jack_src_request_pad_factory ();
 static GstPadTemplate *gst_jack_sink_request_pad_factory ();
 static GstPad *gst_jack_request_new_pad (GstElement * element,
     GstPadTemplate * templ, const gchar * name);
-static GstElementStateReturn gst_jack_change_state (GstElement * element);
+static GstStateChangeReturn gst_jack_change_state (GstElement * element,
+    GstStateChange transition);
 static GstPadLinkReturn gst_jack_link (GstPad * pad, const GstCaps * caps);
 
 static void gst_jack_loop (GstElement * element);
@@ -360,8 +361,8 @@ gst_jack_request_new_pad (GstElement * element, GstPadTemplate * templ,
   return pad->pad;
 }
 
-static GstElementStateReturn
-gst_jack_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_jack_change_state (GstElement * element, GstStateChange transition)
 {
   GstJack *this;
   GList *l = NULL, **pads;
@@ -386,7 +387,7 @@ gst_jack_change_state (GstElement * element)
           this->bin = NULL;
           g_warning ("jack element %s needs to be contained in a jack bin.",
               GST_OBJECT_NAME (element));
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
 
         /* fixme: verify that all names are unique */
@@ -417,7 +418,7 @@ gst_jack_change_state (GstElement * element)
               "rate", G_TYPE_INT, (int) this->bin->rate,
               "buffer-frames", G_TYPE_INT, (gint) this->bin->nframes, NULL);
           if (gst_pad_try_set_caps (pad->pad, caps) <= 0)
-            return GST_STATE_FAILURE;
+            return GST_STATE_CHANGE_FAILURE;
           l = g_list_next (l);
         }
       }
@@ -430,9 +431,9 @@ gst_jack_change_state (GstElement * element)
   JACK_DEBUG ("%s: state change finished", GST_OBJECT_NAME (this));
 
   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 GstPadLinkReturn
diff --git a/ext/jack/gstjackbin.c b/ext/jack/gstjackbin.c
index c2c495701..85a31b1b8 100644
--- a/ext/jack/gstjackbin.c
+++ b/ext/jack/gstjackbin.c
@@ -32,7 +32,8 @@ static GstBinClass *parent_class = NULL;
 static void gst_jack_bin_init (GstJackBin * this);
 static void gst_jack_bin_class_init (GstJackBinClass * klass);
 
-static GstElementStateReturn gst_jack_bin_change_state (GstElement * element);
+static GstStateChangeReturn gst_jack_bin_change_state (GstElement * element,
+    GstStateChange transition);
 
 /* jack callbacks */
 static int process (jack_nframes_t nframes, void *arg);
@@ -98,8 +99,8 @@ gst_jack_bin_init (GstJackBin * this)
   gst_scheduler_factory_make (NULL, GST_ELEMENT (this));
 }
 
-static GstElementStateReturn
-gst_jack_bin_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_jack_bin_change_state (GstElement * element, GstStateChange transition)
 {
   GstJackBin *this;
   GList *l = NULL;
@@ -122,7 +123,8 @@ gst_jack_bin_change_state (GstElement * element)
       _jackbin = NULL;
 
       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);
       break;
 
     case GST_STATE_READY:
@@ -134,7 +136,7 @@ gst_jack_bin_change_state (GstElement * element)
       if (!this->client) {
         if (!(this->client = jack_client_new ("gst-jack"))) {
           g_warning ("jack server not running?");
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
 
         gst_scheduler_setup (GST_ELEMENT_SCHED (this));
@@ -171,7 +173,8 @@ gst_jack_bin_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);
       break;
 
     case GST_STATE_PAUSED:
@@ -216,7 +219,7 @@ gst_jack_bin_change_state (GstElement * element)
                   jack_port_name (pad->port))) {
             g_warning ("jackbin: could not connect %s and %s", pad->peer_name,
                 jack_port_name (pad->port));
-            return GST_STATE_FAILURE;
+            return GST_STATE_CHANGE_FAILURE;
           }
           l = g_list_next (l);
         }
@@ -229,7 +232,7 @@ gst_jack_bin_change_state (GstElement * element)
                   pad->peer_name)) {
             g_warning ("jackbin: could not connect %s and %s", pad->peer_name,
                 jack_port_name (pad->port));
-            return GST_STATE_FAILURE;
+            return GST_STATE_CHANGE_FAILURE;
           }
           l = g_list_next (l);
         }
@@ -238,10 +241,12 @@ gst_jack_bin_change_state (GstElement * element)
         GST_FLAG_SET (GST_OBJECT (this), GST_JACK_OPEN);
 
         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);
       } else {
         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);
       }
 
       break;
@@ -249,13 +254,14 @@ gst_jack_bin_change_state (GstElement * element)
       JACK_DEBUG ("jackbin: PLAYING");
 
       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);
       break;
   }
 
   JACK_DEBUG ("jackbin: state change finished");
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 /* jack callbacks */
diff --git a/ext/lcs/gstcolorspace.c b/ext/lcs/gstcolorspace.c
index da17da25d..ab1167a44 100644
--- a/ext/lcs/gstcolorspace.c
+++ b/ext/lcs/gstcolorspace.c
@@ -95,7 +95,8 @@ static void gst_colorspace_get_property (GObject * object, guint prop_id,
 static GstPadLinkReturn
 gst_colorspace_link (GstPad * pad, const GstCaps * caps);
 static void gst_colorspace_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_colorspace_change_state (GstElement * element);
+static GstStateChangeReturn gst_colorspace_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -424,21 +425,21 @@ gst_colorspace_chain (GstPad * pad, GstData * _data)
   gst_pad_push (space->srcpad, GST_DATA (outbuf));
 }
 
-static GstElementStateReturn
-gst_colorspace_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_colorspace_change_state (GstElement * element, GstStateChange transition)
 {
   GstColorspace *space;
 
   space = GST_COLORSPACE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
   }
 
-  parent_class->change_state (element);
+  parent_class->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 static void
diff --git a/ext/libmms/gstmms.c b/ext/libmms/gstmms.c
index 044235afe..fb514cd41 100644
--- a/ext/libmms/gstmms.c
+++ b/ext/libmms/gstmms.c
@@ -67,7 +67,7 @@ static const GstQueryType *gst_mms_get_query_types (GstPad * pad);
 static const GstFormat *gst_mms_get_formats (GstPad * pad);
 static gboolean gst_mms_srcpad_query (GstPad * pad, GstQueryType type,
     GstFormat * fmt, gint64 * value);
-static GstElementStateReturn gst_mms_change_state (GstElement * elem);
+static GstStateChangeReturn gst_mms_change_state (GstElement * elem);
 
 static GstData *gst_mms_get (GstPad * pad);
 
@@ -286,26 +286,26 @@ gst_mms_get (GstPad * pad)
   return GST_DATA (buf);
 }
 
-static GstElementStateReturn
+static GstStateChangeReturn
 gst_mms_change_state (GstElement * elem)
 {
   GstMMS *mms = GST_MMS (elem);
 
   switch (GST_STATE_TRANSITION (elem)) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       if (!mms->uri_name)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       /* FIXME: pass some sane arguments here */
       mms->connection = mms_connect (NULL, NULL, mms->uri_name, 128 * 1024);
       if (!mms->connection) {
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       break;
     default:
       break;
@@ -314,7 +314,7 @@ gst_mms_change_state (GstElement * elem)
   if (GST_ELEMENT_CLASS (parent_class)->change_state)
     return GST_ELEMENT_CLASS (parent_class)->change_state (elem);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 static void
diff --git a/ext/mpeg2enc/gstmpeg2enc.cc b/ext/mpeg2enc/gstmpeg2enc.cc
index 264eec2ec..d53c28f49 100644
--- a/ext/mpeg2enc/gstmpeg2enc.cc
+++ b/ext/mpeg2enc/gstmpeg2enc.cc
@@ -33,8 +33,7 @@ static void
 add_fps (GstCaps * caps)
 {
   GstStructure *structure = gst_caps_get_structure (caps, 0);
-  GValue list = { 0 }, fps =
-  {
+  GValue list = { 0 }, fps = {
   0};
   gdouble fpss[] = { 24.0 / 1.001, 24.0, 25.0,
     30.0 / 1.001, 30.0, 50.0,
@@ -105,7 +104,8 @@ static void gst_mpeg2enc_loop (GstElement * element);
 static GstPadLinkReturn
 gst_mpeg2enc_sink_link (GstPad * pad, const GstCaps * caps);
 
-static GstElementStateReturn gst_mpeg2enc_change_state (GstElement * element);
+static GstStateChangeReturn gst_mpeg2enc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_mpeg2enc_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
@@ -295,13 +295,13 @@ gst_mpeg2enc_set_property (GObject * object,
   GST_MPEG2ENC (object)->options->setProperty (prop_id, value);
 }
 
-static GstElementStateReturn
-gst_mpeg2enc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mpeg2enc_change_state (GstElement * element, GstStateChange transition)
 {
   GstMpeg2enc *enc = GST_MPEG2ENC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       delete enc->encoder;
       enc->encoder = NULL;
       break;
@@ -310,9 +310,9 @@ gst_mpeg2enc_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
diff --git a/ext/mplex/gstmplex.cc b/ext/mplex/gstmplex.cc
index 9ec4a9314..a4c92f9c3 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
diff --git a/ext/musepack/gstmusepackdec.c b/ext/musepack/gstmusepackdec.c
index 656360a62..46b657839 100644
--- a/ext/musepack/gstmusepackdec.c
+++ b/ext/musepack/gstmusepackdec.c
@@ -67,8 +67,8 @@ static gboolean gst_musepackdec_src_convert (GstPad * pad,
     gint64 src_value, GstFormat * dest_format, gint64 * dest_value);
 
 static void gst_musepackdec_loop (GstElement * element);
-static GstElementStateReturn
-gst_musepackdec_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_musepackdec_change_state (GstElement * element, GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -473,20 +473,20 @@ gst_musepackdec_loop (GstElement * element)
   gst_pad_push (musepackdec->srcpad, GST_DATA (out));
 }
 
-static GstElementStateReturn
-gst_musepackdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_musepackdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstMusepackDec *musepackdec = GST_MUSEPACK_DEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       musepackdec->bs = gst_bytestream_new (musepackdec->sinkpad);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       musepackdec->seek_pending = FALSE;
       musepackdec->init = FALSE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       gst_bytestream_destroy (musepackdec->bs);
       break;
     default:
@@ -494,9 +494,9 @@ gst_musepackdec_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
diff --git a/ext/musicbrainz/gsttrm.c b/ext/musicbrainz/gsttrm.c
index 4afbf5f1d..3f88e9ae9 100644
--- a/ext/musicbrainz/gsttrm.c
+++ b/ext/musicbrainz/gsttrm.c
@@ -79,8 +79,8 @@ static void gst_musicbrainz_set_property (GObject * object, guint prop_id,
 static void gst_musicbrainz_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn
-gst_musicbrainz_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_musicbrainz_change_state (GstElement * element, GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -361,20 +361,20 @@ gst_musicbrainz_get_property (GObject * object, guint prop_id, GValue * value,
 }
 
 
-static GstElementStateReturn
-gst_musicbrainz_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_musicbrainz_change_state (GstElement * element, GstStateChange transition)
 {
   GstMusicBrainz *musicbrainz;
 
-  g_return_val_if_fail (GST_IS_MUSICBRAINZ (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_MUSICBRAINZ (element), GST_STATE_CHANGE_FAILURE);
 
   musicbrainz = GST_MUSICBRAINZ (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       musicbrainz->trm = trm_New ();
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       trm_Delete (musicbrainz->trm);
       musicbrainz->trm = NULL;
       musicbrainz->linked = FALSE;
@@ -387,9 +387,9 @@ gst_musicbrainz_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
diff --git a/ext/nas/nassink.c b/ext/nas/nassink.c
index dd3a556ee..c685eb915 100644
--- a/ext/nas/nassink.c
+++ b/ext/nas/nassink.c
@@ -71,7 +71,8 @@ static void gst_nassink_finalize (GObject * object);
 
 static gboolean gst_nassink_open_audio (GstNassink * sink);
 static void gst_nassink_close_audio (GstNassink * sink);
-static GstElementStateReturn gst_nassink_change_state (GstElement * element);
+static GstStateChangeReturn gst_nassink_change_state (GstElement * element,
+    GstStateChange transition);
 static GstCaps *gst_nassink_getcaps (GstPad * pad);
 static gboolean gst_nassink_sync_parms (GstNassink * nassink);
 static GstPadLinkReturn gst_nassink_sinkconnect (GstPad * pad,
@@ -459,8 +460,8 @@ gst_nassink_close_audio (GstNassink * sink)
   GST_CAT_DEBUG (NAS, "closed audio device");
 }
 
-static GstElementStateReturn
-gst_nassink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_nassink_change_state (GstElement * element, GstStateChange transition)
 {
   GstNassink *nassink;
 
@@ -489,9 +490,9 @@ gst_nassink_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 void
diff --git a/ext/polyp/polypsink.c b/ext/polyp/polypsink.c
index b9e869015..7fa2a1241 100644
--- a/ext/polyp/polypsink.c
+++ b/ext/polyp/polypsink.c
@@ -127,24 +127,24 @@ gst_polypsink_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_polypsink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_polypsink_change_state (GstElement * element, GstStateChange transition)
 {
   GstPolypSink *polypsink;
 
   polypsink = GST_POLYPSINK (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
+  switch (transition) {
 
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       create_context (polypsink);
       break;
 
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       destroy_context (polypsink);
       break;
 
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
 
       create_stream (polypsink);
 
@@ -153,7 +153,7 @@ gst_polypsink_change_state (GstElement * element)
         pa_operation_unref (pa_stream_cork (polypsink->stream, 1, NULL, NULL));
       break;
 
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
 
       if (polypsink->stream
           && pa_stream_get_state (polypsink->stream) == PA_STREAM_READY)
@@ -161,7 +161,7 @@ gst_polypsink_change_state (GstElement * element)
 
       break;
 
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
 
       create_stream (polypsink);
 
@@ -171,16 +171,16 @@ gst_polypsink_change_state (GstElement * element)
 
       break;
 
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
 
       destroy_stream (polypsink);
       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;
 }
 
 
@@ -265,7 +265,7 @@ context_state_callback (struct pa_context *c, void *userdata)
       break;
 
     case PA_CONTEXT_READY:{
-      GstElementState state;
+      GstState state;
 
       g_assert (!polypsink->stream);
 
@@ -500,7 +500,7 @@ gst_polypsink_link (GstPad * pad, const GstCaps * caps)
   GstStructure *structure;
   const char *n;
   char t[256];
-  GstElementState state;
+  GstState state;
   int n_channels;
 
   polypsink = GST_POLYPSINK (gst_pad_get_parent (pad));
diff --git a/ext/sdl/sdlvideosink.c b/ext/sdl/sdlvideosink.c
index 4c11b6f6c..6a5b74184 100644
--- a/ext/sdl/sdlvideosink.c
+++ b/ext/sdl/sdlvideosink.c
@@ -71,8 +71,8 @@ static void gst_sdlvideosink_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec);
 static void gst_sdlvideosink_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
-static GstElementStateReturn
-gst_sdlvideosink_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_sdlvideosink_change_state (GstElement * element, GstStateChange transition);
 
 
 static GstPadTemplate *sink_template;
@@ -669,24 +669,25 @@ gst_sdlvideosink_get_property (GObject * object, guint prop_id, GValue * value,
 }
 
 
-static GstElementStateReturn
-gst_sdlvideosink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sdlvideosink_change_state (GstElement * element, GstStateChange transition)
 {
   GstSDLVideoSink *sdlvideosink;
 
-  g_return_val_if_fail (GST_IS_SDLVIDEOSINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_SDLVIDEOSINK (element),
+      GST_STATE_CHANGE_FAILURE);
   sdlvideosink = GST_SDLVIDEOSINK (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_sdlvideosink_initsdl (sdlvideosink))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       GST_FLAG_SET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_sdlvideosink_destroy (sdlvideosink);
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       gst_sdlvideosink_deinitsdl (sdlvideosink);
       GST_FLAG_UNSET (sdlvideosink, GST_SDLVIDEOSINK_OPEN);
       break;
@@ -695,9 +696,9 @@ gst_sdlvideosink_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/ext/shout/gstshout.c b/ext/shout/gstshout.c
index 6f007c5f2..48e0e100c 100644
--- a/ext/shout/gstshout.c
+++ b/ext/shout/gstshout.c
@@ -85,7 +85,8 @@ static void gst_icecastsend_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
 static
-    GstElementStateReturn gst_icecastsend_change_state (GstElement * element);
+    GstStateChangeReturn gst_icecastsend_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -372,20 +373,20 @@ gst_icecastsend_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_icecastsend_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_icecastsend_change_state (GstElement * element, GstStateChange transition)
 {
   GstIcecastSend *icecastsend;
 
-  g_return_val_if_fail (GST_IS_ICECASTSEND (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_ICECASTSEND (element), GST_STATE_CHANGE_FAILURE);
 
   icecastsend = GST_ICECASTSEND (element);
 
   GST_DEBUG ("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:
       shout_init_connection (&icecastsend->conn);
 
       /* --- FIXME: shout requires an ip, and fails if it is given a host. */
@@ -412,10 +413,10 @@ gst_icecastsend_change_state (GstElement * element)
         g_warning ("couldn't connect to server... (%i: %s)\n",
             icecastsend->conn.error, SHOUT_ERRORS[icecastsend->conn.error]);
         shout_disconnect (&icecastsend->conn);
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       shout_disconnect (&icecastsend->conn);
       break;
     default:
@@ -424,9 +425,9 @@ gst_icecastsend_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;
 }
 
 static gboolean
diff --git a/ext/smoothwave/gstsmoothwave.c b/ext/smoothwave/gstsmoothwave.c
index 16d57da6d..97d1dd5f6 100644
--- a/ext/smoothwave/gstsmoothwave.c
+++ b/ext/smoothwave/gstsmoothwave.c
@@ -47,7 +47,8 @@ static void gst_smoothwave_base_init (gpointer g_class);
 static void gst_smoothwave_class_init (GstSmoothWaveClass * klass);
 static void gst_smoothwave_init (GstSmoothWave * smoothwave);
 static void gst_smoothwave_dispose (GObject * object);
-static GstElementStateReturn gst_sw_change_state (GstElement * element);
+static GstStateChangeReturn gst_sw_change_state (GstElement * element,
+    GstStateChange transition);
 static void gst_smoothwave_chain (GstPad * pad, GstData * _data);
 static GstPadLinkReturn gst_sw_sinklink (GstPad * pad, const GstCaps * caps);
 static GstPadLinkReturn gst_sw_srclink (GstPad * pad, const GstCaps * caps);
@@ -401,28 +402,28 @@ gst_smoothwave_chain (GstPad * pad, GstData * _data)
   }
 }
 
-static GstElementStateReturn
-gst_sw_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sw_change_state (GstElement * element, GstStateChange transition)
 {
   GstSmoothWave *sw = GST_SMOOTHWAVE (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_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       sw->audio_basetime = GST_CLOCK_TIME_NONE;
       gst_adapter_clear (sw->adapter);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       sw->channels = 0;
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 static gboolean
diff --git a/ext/sndfile/gstsf.c b/ext/sndfile/gstsf.c
index fa75adb89..5a5e37125 100644
--- a/ext/sndfile/gstsf.c
+++ b/ext/sndfile/gstsf.c
@@ -158,7 +158,8 @@ static void gst_sf_set_clock (GstElement * element, GstClock * clock);
 static GstPad *gst_sf_request_new_pad (GstElement * element,
     GstPadTemplate * templ, const gchar * unused);
 static void gst_sf_release_request_pad (GstElement * element, GstPad * pad);
-static GstElementStateReturn gst_sf_change_state (GstElement * element);
+static GstStateChangeReturn gst_sf_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstPadLinkReturn gst_sf_link (GstPad * pad, const GstCaps * caps);
 
@@ -441,35 +442,35 @@ gst_sf_get_time (GstClock * clock, gpointer data)
   return this->time;
 }
 
-static GstElementStateReturn
-gst_sf_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sf_change_state (GstElement * element, GstStateChange transition)
 {
   GstSF *this = GST_SF (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:
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       gst_audio_clock_set_active (GST_AUDIO_CLOCK (this->provided_clock), TRUE);
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       gst_audio_clock_set_active (GST_AUDIO_CLOCK (this->provided_clock),
           FALSE);
       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:
       if (GST_FLAG_IS_SET (this, GST_SF_OPEN))
         gst_sf_close_file (this);
       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 GstPad *
diff --git a/ext/swfdec/gstswfdec.c b/ext/swfdec/gstswfdec.c
index c6f952e52..ef8077a73 100644
--- a/ext/swfdec/gstswfdec.c
+++ b/ext/swfdec/gstswfdec.c
@@ -88,7 +88,8 @@ static gboolean gst_swfdec_src_query (GstPad * pad, GstQueryType type,
 static const GstQueryType *gst_swfdec_get_query_types (GstPad * pad);
 static const GstEventMask *gst_swfdec_get_event_masks (GstPad * pad);
 
-static GstElementStateReturn gst_swfdec_change_state (GstElement * element);
+static GstStateChangeReturn gst_swfdec_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -516,15 +517,15 @@ gst_swfdec_src_event (GstPad * pad, GstEvent * event)
   return res;
 }
 
-static GstElementStateReturn
-gst_swfdec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_swfdec_change_state (GstElement * element, GstStateChange transition)
 {
   GstSwfdec *swfdec = GST_SWFDEC (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:
     {
       //gst_swfdec_vo_open (swfdec);
       //swfdec_decoder_new (swfdec->decoder, swfdec->accel, swfdec->vo);
@@ -542,11 +543,11 @@ gst_swfdec_change_state (GstElement * element)
       swfdec->first = 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 we are not closed by an EOS event do so now, this cen send a few frames but
        * we are prepared to not really send them (see above) */
       if (!swfdec->closed) {
@@ -555,13 +556,13 @@ gst_swfdec_change_state (GstElement * element)
       }
       //gst_swfdec_vo_destroy (swfdec);
       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 void
diff --git a/ext/tarkin/gsttarkindec.c b/ext/tarkin/gsttarkindec.c
index 67bf2fba0..07ec652c1 100644
--- a/ext/tarkin/gsttarkindec.c
+++ b/ext/tarkin/gsttarkindec.c
@@ -55,7 +55,8 @@ static void gst_tarkindec_init (TarkinDec * arkindec);
 
 static void gst_tarkindec_chain (GstPad * pad, GstData * _data);
 static void gst_tarkindec_setup (TarkinDec * tarkindec);
-static GstElementStateReturn gst_tarkindec_change_state (GstElement * element);
+static GstStateChangeReturn gst_tarkindec_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void gst_tarkindec_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
@@ -278,24 +279,24 @@ gst_tarkindec_chain (GstPad * pad, GstData * _data)
   }
 }
 
-static GstElementStateReturn
-gst_tarkindec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_tarkindec_change_state (GstElement * element, GstStateChange transition)
 {
   TarkinDec *tarkindec;
 
   tarkindec = GST_TARKINDEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       gst_tarkindec_setup (tarkindec);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
     default:
       break;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
 
 static void
diff --git a/ext/xine/xine.c b/ext/xine/xine.c
index 68aebc280..5225f0cfc 100644
--- a/ext/xine/xine.c
+++ b/ext/xine/xine.c
@@ -25,7 +25,8 @@
 
 GST_BOILERPLATE (GstXine, gst_xine, GstElement, GST_TYPE_ELEMENT)
 
-     static GstElementStateReturn gst_xine_change_state (GstElement * element);
+     static GstStateChangeReturn gst_xine_change_state (GstElement * element,
+    GstStateChange transition);
 
      static xine_ao_driver_t *_xine_create_audio_driver (GstXine * xine);
      static xine_vo_driver_t *_xine_create_video_driver (GstXine * xine);
@@ -54,23 +55,23 @@ gst_xine_init (GstXine * filter, GstXineClass * g_class)
 {
 }
 
-static GstElementStateReturn
-gst_xine_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xine_change_state (GstElement * element, GstStateChange transition)
 {
   GstXine *xine = GST_XINE (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:
       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:
       if (xine->stream != NULL)
         gst_xine_free_stream (xine);
       break;
@@ -80,7 +81,7 @@ gst_xine_change_state (GstElement * element)
   }
 
   return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
-      (element), GST_STATE_SUCCESS);
+      (element), GST_STATE_CHANGE_SUCCESS);
 }
 
 static xine_ao_driver_t *
diff --git a/ext/xine/xineaudiodec.c b/ext/xine/xineaudiodec.c
index ce9850860..77200e028 100644
--- a/ext/xine/xineaudiodec.c
+++ b/ext/xine/xineaudiodec.c
@@ -233,8 +233,9 @@ _gst_xine_audio_dec_create_audio_driver (GstXine * xine)
 GST_BOILERPLATE (GstXineAudioDec, gst_xine_audio_dec, GstXine, GST_TYPE_XINE)
 
      static void gst_xine_audio_dec_chain (GstPad * pad, GstData * in);
-     static GstElementStateReturn
-         gst_xine_audio_dec_change_state (GstElement * element);
+     static GstStateChangeReturn
+         gst_xine_audio_dec_change_state (GstElement * element,
+    GstStateChange transition);
 
 /* this function handles the link with other plug-ins */
      static GstPadLinkReturn
@@ -401,26 +402,27 @@ _load_decoder (GstXineAudioDec * dec)
   return ret;
 }
 
-static GstElementStateReturn
-gst_xine_audio_dec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xine_audio_dec_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstXineAudioDec *xine = GST_XINE_AUDIO_DEC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       xine->decoder = _load_decoder (xine);
       if (!xine->decoder)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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:
       xine->setup = FALSE;
       _x_free_audio_decoder (gst_xine_get_stream (GST_XINE (xine)),
           xine->decoder);
@@ -431,7 +433,7 @@ gst_xine_audio_dec_change_state (GstElement * element)
   }
 
   return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
-      (element), GST_STATE_SUCCESS);
+      (element), GST_STATE_CHANGE_SUCCESS);
 }
 
 /** GstXineAudioDec subclasses ************************************************/
diff --git a/ext/xine/xineaudiosink.c b/ext/xine/xineaudiosink.c
index 165457b1b..2073bcfb9 100644
--- a/ext/xine/xineaudiosink.c
+++ b/ext/xine/xineaudiosink.c
@@ -62,8 +62,9 @@ struct _GstXineAudioSinkClass
 
 GST_BOILERPLATE (GstXineAudioSink, gst_xine_audio_sink, GstXine, GST_TYPE_XINE)
 
-     static GstElementStateReturn
-         gst_xine_audio_sink_change_state (GstElement * element);
+     static GstStateChangeReturn
+         gst_xine_audio_sink_change_state (GstElement * element,
+    GstStateChange transition);
 
      static void gst_xine_audio_sink_base_init (gpointer g_class)
 {
@@ -94,46 +95,47 @@ gst_xine_audio_sink_chain (GstPad * pad, GstData * data)
   gst_data_unref (GST_DATA (data));
 }
 
-static GstElementStateReturn
-gst_xine_audio_sink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xine_audio_sink_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstXineAudioSink *xine = GST_XINE_AUDIO_SINK (element);
   audio_driver_class_t *driver =
       (audio_driver_class_t *) GST_XINE_AUDIO_SINK_GET_CLASS (xine)->
       plugin_node->plugin_class;
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (driver == NULL) {
         xine_audio_port_t *port =
             xine_open_audio_driver (GST_XINE_GET_CLASS (xine)->xine,
             GST_XINE_AUDIO_SINK_GET_CLASS (xine)->plugin_node->info->id, NULL);
 
         if (!port)
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         port->exit (port);
         driver =
             (audio_driver_class_t *) GST_XINE_AUDIO_SINK_GET_CLASS (xine)->
             plugin_node->plugin_class;
         if (driver == NULL)
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
       }
       xine->driver = driver->open_plugin (driver, NULL);
       if (!xine->driver)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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 (xine->open != 0)
         xine->driver->close (xine->driver);
       xine->open = 0;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       xine->driver->exit (xine->driver);
       xine->driver = NULL;
       break;
@@ -143,7 +145,7 @@ gst_xine_audio_sink_change_state (GstElement * element)
   }
 
   return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
-      (element), GST_STATE_SUCCESS);
+      (element), GST_STATE_CHANGE_SUCCESS);
 }
 
 static GstCaps *
diff --git a/ext/xine/xineinput.c b/ext/xine/xineinput.c
index 705009a17..bdc84195b 100644
--- a/ext/xine/xineinput.c
+++ b/ext/xine/xineinput.c
@@ -74,8 +74,9 @@ GST_BOILERPLATE (GstXineInput, gst_xine_input, GstXine, GST_TYPE_XINE)
     const GValue * value, GParamSpec * pspec);
      static void gst_xine_input_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-     static GstElementStateReturn
-         gst_xine_input_change_state (GstElement * element);
+     static GstStateChangeReturn
+         gst_xine_input_change_state (GstElement * element,
+    GstStateChange transition);
 
      static void gst_xine_input_base_init (gpointer g_class)
 {
@@ -202,37 +203,37 @@ gst_xine_input_get (GstPad * pad)
   return GST_DATA (buf);
 }
 
-static GstElementStateReturn
-gst_xine_input_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xine_input_change_state (GstElement * element, GstStateChange transition)
 {
   GstXineInput *xine = GST_XINE_INPUT (element);
   input_class_t *input =
       (input_class_t *) GST_XINE_INPUT_GET_CLASS (xine)->plugin_node->
       plugin_class;
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       xine->input =
           input->get_instance (input, gst_xine_get_stream (GST_XINE (xine)),
           xine->location);
       if (!xine->input)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       if (xine->input->open (xine->input) == 0)
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       xine->blocksize = xine->input->get_blocksize (xine->input);
       if (xine->blocksize == 0)
         xine->blocksize = BUFFER_SIZE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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:
       /* FIXME: reset stream */
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       xine->input->dispose (xine->input);
       xine->input = NULL;
       break;
@@ -242,7 +243,7 @@ gst_xine_input_change_state (GstElement * element)
   }
 
   return GST_CALL_PARENT_WITH_DEFAULT (GST_ELEMENT_CLASS, change_state,
-      (element), GST_STATE_SUCCESS);
+      (element), GST_STATE_CHANGE_SUCCESS);
 }
 
 /** GstXineInput subclasses ************************************************/
diff --git a/ext/xvid/gstxviddec.c b/ext/xvid/gstxviddec.c
index 42c716ff1..44d5b267b 100644
--- a/ext/xvid/gstxviddec.c
+++ b/ext/xvid/gstxviddec.c
@@ -78,7 +78,8 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscapslist);
 static GstPadLinkReturn
 gst_xviddec_src_link (GstPad * pad, const GstCaps * vscapslist);
 static GstCaps *gst_xviddec_src_getcaps (GstPad * pad);
-static GstElementStateReturn gst_xviddec_change_state (GstElement * element);
+static GstStateChangeReturn gst_xviddec_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -350,13 +351,13 @@ gst_xviddec_sink_link (GstPad * pad, const GstCaps * vscaps)
   return ret;
 }
 
-static GstElementStateReturn
-gst_xviddec_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xviddec_change_state (GstElement * element, GstStateChange transition)
 {
   GstXvidDec *xviddec = GST_XVIDDEC (element);
 
   switch (GST_STATE_PENDING (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (xviddec->handle) {
         gst_xviddec_unset (xviddec);
       }
@@ -366,7 +367,7 @@ gst_xviddec_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;
 }
diff --git a/ext/xvid/gstxvidenc.c b/ext/xvid/gstxvidenc.c
index e71bb2591..4fc4c0c7a 100644
--- a/ext/xvid/gstxvidenc.c
+++ b/ext/xvid/gstxvidenc.c
@@ -92,7 +92,8 @@ static void gst_xvidenc_set_property (GObject * object,
     guint prop_id, const GValue * value, GParamSpec * pspec);
 static void gst_xvidenc_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_xvidenc_change_state (GstElement * element);
+static GstStateChangeReturn gst_xvidenc_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 static guint gst_xvidenc_signals[LAST_SIGNAL] = { 0 };
@@ -473,13 +474,13 @@ gst_xvidenc_get_property (GObject * object,
   }
 }
 
-static GstElementStateReturn
-gst_xvidenc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_xvidenc_change_state (GstElement * element, GstStateChange transition)
 {
   GstXvidEnc *xvidenc = GST_XVIDENC (element);
 
   switch (GST_STATE_PENDING (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (xvidenc->handle) {
         xvid_encore (xvidenc->handle, XVID_ENC_DESTROY, NULL, NULL);
         xvidenc->handle = NULL;
@@ -490,7 +491,7 @@ gst_xvidenc_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;
 }
diff --git a/gst/apetag/apedemux.c b/gst/apetag/apedemux.c
index f1d10a2be..8f8197c15 100644
--- a/gst/apetag/apedemux.c
+++ b/gst/apetag/apedemux.c
@@ -54,7 +54,8 @@ static const GstQueryType *gst_ape_demux_get_src_query_types (GstPad * pad);
 static gboolean gst_ape_demux_handle_src_query (GstPad * pad,
     GstQueryType type, GstFormat * format, gint64 * value);
 
-static GstElementStateReturn gst_ape_demux_change_state (GstElement * element);
+static GstStateChangeReturn gst_ape_demux_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -787,13 +788,13 @@ gst_ape_demux_loop (GstElement * element)
   }
 }
 
-static GstElementStateReturn
-gst_ape_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_ape_demux_change_state (GstElement * element, GstStateChange transition)
 {
   GstApeDemux *ape = GST_APE_DEMUX (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (ape->srcpad) {
         gst_element_remove_pad (element, ape->srcpad);
         ape->srcpad = NULL;
@@ -806,7 +807,7 @@ gst_ape_demux_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/cdxaparse/gstcdxaparse.c b/gst/cdxaparse/gstcdxaparse.c
index 502d96a8a..10dbd6f1d 100644
--- a/gst/cdxaparse/gstcdxaparse.c
+++ b/gst/cdxaparse/gstcdxaparse.c
@@ -33,7 +33,8 @@ static void gst_cdxaparse_class_init (GstCDXAParseClass * klass);
 static void gst_cdxaparse_init (GstCDXAParse * cdxaparse);
 
 static void gst_cdxaparse_loop (GstElement * element);
-static GstElementStateReturn gst_cdxaparse_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxaparse_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstStaticPadTemplate sink_template_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -281,16 +282,16 @@ gst_cdxaparse_loop (GstElement * element)
   }
 }
 
-static GstElementStateReturn
-gst_cdxaparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxaparse_change_state (GstElement * element, GstStateChange transition)
 {
   GstCDXAParse *cdxa = GST_CDXAPARSE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_READY_TO_PAUSED:
+  switch (transition) {
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       cdxa->state = GST_CDXAPARSE_START;
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       cdxa->state = GST_CDXAPARSE_START;
       cdxa->seek_pending = FALSE;
       cdxa->seek_offset = 0;
@@ -300,9 +301,9 @@ gst_cdxaparse_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
diff --git a/gst/cdxaparse/gstcdxastrip.c b/gst/cdxaparse/gstcdxastrip.c
index 312c30281..2138ce37e 100644
--- a/gst/cdxaparse/gstcdxastrip.c
+++ b/gst/cdxaparse/gstcdxastrip.c
@@ -37,7 +37,8 @@ static gboolean gst_cdxastrip_handle_src_query (GstPad * pad,
     GstQueryType type, GstFormat * format, gint64 * value);
 
 static void gst_cdxastrip_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_cdxastrip_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxastrip_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstStaticPadTemplate sink_template_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -388,13 +389,13 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data)
   cdxa->cache = buf;
 }
 
-static GstElementStateReturn
-gst_cdxastrip_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxastrip_change_state (GstElement * element, GstStateChange transition)
 {
   GstCDXAStrip *cdxa = GST_CDXASTRIP (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (cdxa->cache) {
         gst_buffer_unref (cdxa->cache);
         cdxa->cache = NULL;
@@ -405,7 +406,7 @@ gst_cdxastrip_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;
 }
diff --git a/gst/cdxaparse/gstvcdparse.c b/gst/cdxaparse/gstvcdparse.c
index 312c30281..2138ce37e 100644
--- a/gst/cdxaparse/gstvcdparse.c
+++ b/gst/cdxaparse/gstvcdparse.c
@@ -37,7 +37,8 @@ static gboolean gst_cdxastrip_handle_src_query (GstPad * pad,
     GstQueryType type, GstFormat * format, gint64 * value);
 
 static void gst_cdxastrip_chain (GstPad * pad, GstData * data);
-static GstElementStateReturn gst_cdxastrip_change_state (GstElement * element);
+static GstStateChangeReturn gst_cdxastrip_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstStaticPadTemplate sink_template_factory =
 GST_STATIC_PAD_TEMPLATE ("sink",
@@ -388,13 +389,13 @@ gst_cdxastrip_chain (GstPad * pad, GstData * data)
   cdxa->cache = buf;
 }
 
-static GstElementStateReturn
-gst_cdxastrip_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_cdxastrip_change_state (GstElement * element, GstStateChange transition)
 {
   GstCDXAStrip *cdxa = GST_CDXASTRIP (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (cdxa->cache) {
         gst_buffer_unref (cdxa->cache);
         cdxa->cache = NULL;
@@ -405,7 +406,7 @@ gst_cdxastrip_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;
 }
diff --git a/gst/colorspace/gstcolorspace.c b/gst/colorspace/gstcolorspace.c
index bbdf48b45..5f2d2726d 100644
--- a/gst/colorspace/gstcolorspace.c
+++ b/gst/colorspace/gstcolorspace.c
@@ -91,7 +91,8 @@ static void gst_colorspace_get_property (GObject * object, guint prop_id,
 static GstPadLinkReturn
 gst_colorspace_link (GstPad * pad, const GstCaps * caps);
 static void gst_colorspace_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_colorspace_change_state (GstElement * element);
+static GstStateChangeReturn gst_colorspace_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -563,23 +564,23 @@ gst_colorspace_chain (GstPad * pad, GstData * _data)
   gst_pad_push (space->srcpad, GST_DATA (outbuf));
 }
 
-static GstElementStateReturn
-gst_colorspace_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_colorspace_change_state (GstElement * element, GstStateChange transition)
 {
   GstColorspace *space;
 
   space = GST_COLORSPACE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_PLAYING:
+  switch (transition) {
+    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;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
 
 static void
diff --git a/gst/festival/gstfestival.c b/gst/festival/gstfestival.c
index 0aefe2338..62e60e648 100644
--- a/gst/festival/gstfestival.c
+++ b/gst/festival/gstfestival.c
@@ -82,7 +82,8 @@ static void gst_festival_class_init (GstFestivalClass * klass);
 static void gst_festival_init (GstFestival * festival);
 
 static void gst_festival_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_festival_change_state (GstElement * element);
+static GstStateChangeReturn gst_festival_change_state (GstElement * element,
+    GstStateChange transition);
 
 static FT_Info *festival_default_info (void);
 static char *socket_receive_file_to_buff (int fd, int *size);
@@ -410,10 +411,10 @@ gst_festival_close (GstFestival * festival)
   return;
 }
 
-static GstElementStateReturn
-gst_festival_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_festival_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_FESTIVAL (element), GST_STATE_CHANGE_FAILURE);
 
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
     if (GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN))
@@ -421,14 +422,14 @@ gst_festival_change_state (GstElement * element)
   } else {
     if (!GST_FLAG_IS_SET (element, GST_FESTIVAL_OPEN)) {
       if (!gst_festival_open (GST_FESTIVAL (element)))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
     }
   }
 
   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/librfb/gstrfbsrc.c b/gst/librfb/gstrfbsrc.c
index 5793907be..5f53a3a3e 100644
--- a/gst/librfb/gstrfbsrc.c
+++ b/gst/librfb/gstrfbsrc.c
@@ -100,8 +100,7 @@ gst_rfbsrc_get_type (void)
      static void gst_rfbsrc_base_init (gpointer g_class);
      static void gst_rfbsrc_class_init (GstRfbsrcClass * klass);
      static void gst_rfbsrc_init (GstRfbsrc * rfbsrc);
-     static GstElementStateReturn gst_rfbsrc_change_state (GstElement *
-    element);
+     static GstStateChangeReturn gst_rfbsrc_change_state (GstElement * element);
 
      static void gst_rfbsrc_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
@@ -206,31 +205,31 @@ gst_rfbsrc_class_init (GstRfbsrcClass * klass)
   gstelement_class->change_state = gst_rfbsrc_change_state;
 }
 
-static GstElementStateReturn
-gst_rfbsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_rfbsrc_change_state (GstElement * element, GstStateChange transition)
 {
   GstRfbsrc *rfbsrc;
 
   rfbsrc = GST_RFBSRC (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       rfbsrc->decoder = rfb_decoder_new ();
       rfb_decoder_connect_tcp (rfbsrc->decoder, rfbsrc->server, rfbsrc->port);
       rfbsrc->decoder->paint_rect = gst_rfbsrc_paint_rect;
       rfbsrc->decoder->decoder_private = rfbsrc;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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:
       //rfbsrc->timestamp_offset = 0;
       //rfbsrc->n_frames = 0;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       if (rfbsrc->frame) {
         g_free (rfbsrc->frame);
         rfbsrc->frame = NULL;
@@ -238,7 +237,7 @@ gst_rfbsrc_change_state (GstElement * element)
       break;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
 
 static void
diff --git a/gst/modplug/gstmodplug.cc b/gst/modplug/gstmodplug.cc
index 6d4c4ab53..dabcfcb33 100644
--- a/gst/modplug/gstmodplug.cc
+++ b/gst/modplug/gstmodplug.cc
@@ -111,7 +111,8 @@ static const GstQueryType *gst_modplug_get_query_types (GstPad * pad);
 static gboolean gst_modplug_src_event (GstPad * pad, GstEvent * event);
 static gboolean gst_modplug_src_query (GstPad * pad,
     GstQueryType type, GstFormat * format, gint64 * value);
-static GstElementStateReturn gst_modplug_change_state (GstElement * element);
+static GstStateChangeReturn gst_modplug_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -673,26 +674,26 @@ gst_modplug_loop (GstElement * element)
 }
 
 
-static GstElementStateReturn
-gst_modplug_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_modplug_change_state (GstElement * element, GstStateChange transition)
 {
   GstModPlug *modplug;
 
   modplug = GST_MODPLUG (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:
       modplug->bs = gst_bytestream_new (modplug->sinkpad);
       modplug->song_size = 0;
       modplug->state = MODPLUG_STATE_NEED_TUNE;
       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:
       gst_bytestream_destroy (modplug->bs);
       modplug->bs = NULL;
       if (modplug->opened) {
@@ -705,16 +706,16 @@ gst_modplug_change_state (GstElement * element)
       modplug->audiobuffer = NULL;
       modplug->state = MODPLUG_STATE_NEED_TUNE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       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/mpeg1videoparse/gstmp1videoparse.c b/gst/mpeg1videoparse/gstmp1videoparse.c
index c1510f0f1..1803ff5fd 100644
--- a/gst/mpeg1videoparse/gstmp1videoparse.c
+++ b/gst/mpeg1videoparse/gstmp1videoparse.c
@@ -82,8 +82,9 @@ static void gst_mp1videoparse_chain (GstPad * pad, GstData * _data);
 static void gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse,
     GstBuffer * buf, GstPad * outpad);
 static void gst_mp1videoparse_flush (Mp1VideoParse * mp1videoparse);
-static GstElementStateReturn
-gst_mp1videoparse_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_mp1videoparse_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -543,17 +544,18 @@ gst_mp1videoparse_real_chain (Mp1VideoParse * mp1videoparse, GstBuffer * buf,
   } while (mp1videoparse->partialbuf != NULL);
 }
 
-static GstElementStateReturn
-gst_mp1videoparse_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_mp1videoparse_change_state (GstElement * element, GstStateChange transition)
 {
   Mp1VideoParse *mp1videoparse;
 
-  g_return_val_if_fail (GST_IS_MP1VIDEOPARSE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_MP1VIDEOPARSE (element),
+      GST_STATE_CHANGE_FAILURE);
 
   mp1videoparse = GST_MP1VIDEOPARSE (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       gst_mp1videoparse_flush (mp1videoparse);
       mp1videoparse->need_discont = TRUE;
       mp1videoparse->width = mp1videoparse->height = -1;
@@ -564,9 +566,9 @@ gst_mp1videoparse_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
diff --git a/gst/mpegaudioparse/gstmpegaudioparse.c b/gst/mpegaudioparse/gstmpegaudioparse.c
index 90775ea42..2602386ed 100644
--- 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/multifilesink/gstmultifilesink.c b/gst/multifilesink/gstmultifilesink.c
index 2372465ba..4f320468a 100644
--- a/gst/multifilesink/gstmultifilesink.c
+++ b/gst/multifilesink/gstmultifilesink.c
@@ -104,7 +104,7 @@ static void gst_multifilesink_chain (GstPad * pad, GstData * _data);
 static void gst_multifilesink_uri_handler_init (gpointer g_iface,
     gpointer iface_data);
 
-static GstElementStateReturn gst_multifilesink_change_state (GstElement *
+static GstStateChangeReturn gst_multifilesink_change_state (GstElement *
     element);
 
 static guint gst_multifilesink_signals[LAST_SIGNAL] = { 0 };
@@ -587,29 +587,30 @@ gst_multifilesink_chain (GstPad * pad, GstData * _data)
       gst_multifilesink_signals[SIGNAL_HANDOFF], 0, filesink);
 }
 
-static GstElementStateReturn
-gst_multifilesink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_multifilesink_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_MULTIFILESINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_MULTIFILESINK (element),
+      GST_STATE_CHANGE_FAILURE);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       if (GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN))
         gst_multifilesink_close_file (GST_MULTIFILESINK (element));
       break;
 
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       if (!GST_FLAG_IS_SET (element, GST_MULTIFILESINK_OPEN)) {
         if (!gst_multifilesink_open_file (GST_MULTIFILESINK (element)))
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
       }
       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;
 }
 
 /*** GSTURIHANDLER INTERFACE *************************************************/
diff --git a/gst/smoothwave/gstsmoothwave.c b/gst/smoothwave/gstsmoothwave.c
index 16d57da6d..97d1dd5f6 100644
--- a/gst/smoothwave/gstsmoothwave.c
+++ b/gst/smoothwave/gstsmoothwave.c
@@ -47,7 +47,8 @@ static void gst_smoothwave_base_init (gpointer g_class);
 static void gst_smoothwave_class_init (GstSmoothWaveClass * klass);
 static void gst_smoothwave_init (GstSmoothWave * smoothwave);
 static void gst_smoothwave_dispose (GObject * object);
-static GstElementStateReturn gst_sw_change_state (GstElement * element);
+static GstStateChangeReturn gst_sw_change_state (GstElement * element,
+    GstStateChange transition);
 static void gst_smoothwave_chain (GstPad * pad, GstData * _data);
 static GstPadLinkReturn gst_sw_sinklink (GstPad * pad, const GstCaps * caps);
 static GstPadLinkReturn gst_sw_srclink (GstPad * pad, const GstCaps * caps);
@@ -401,28 +402,28 @@ gst_smoothwave_chain (GstPad * pad, GstData * _data)
   }
 }
 
-static GstElementStateReturn
-gst_sw_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sw_change_state (GstElement * element, GstStateChange transition)
 {
   GstSmoothWave *sw = GST_SMOOTHWAVE (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_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       sw->audio_basetime = GST_CLOCK_TIME_NONE;
       gst_adapter_clear (sw->adapter);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       sw->channels = 0;
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
 
 static gboolean
diff --git a/gst/speed/gstspeed.c b/gst/speed/gstspeed.c
index f784c1051..49e0cc83d 100644
--- a/gst/speed/gstspeed.c
+++ b/gst/speed/gstspeed.c
@@ -87,7 +87,8 @@ static gboolean speed_parse_caps (GstSpeed * filter, const GstCaps * caps);
 
 static void speed_chain (GstPad * pad, GstData * data);
 
-static GstElementStateReturn speed_change_state (GstElement * element);
+static GstStateChangeReturn speed_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class;   /* NULL */
 
@@ -471,15 +472,15 @@ speed_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-speed_change_state (GstElement * element)
+static GstStateChangeReturn
+speed_change_state (GstElement * element, GstStateChange transition)
 {
   GstSpeed *speed = GST_SPEED (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       speed->offset = 0;
       speed->timestamp = 0;
       speed->sample_size = 0;
@@ -489,9 +490,9 @@ speed_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
diff --git a/gst/switch/gstswitch.c b/gst/switch/gstswitch.c
index 2612e00b8..daf4b4905 100644
--- a/gst/switch/gstswitch.c
+++ b/gst/switch/gstswitch.c
@@ -256,21 +256,21 @@ gst_switch_loop (GstElement * element)
   }
 }
 
-static GstElementStateReturn
-gst_switch_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_switch_change_state (GstElement * element, GstStateChange transition)
 {
   GstSwitch *gstswitch;
 
   gstswitch = GST_SWITCH (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:
       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:
     {
       GList *sinkpads = NULL;
 
@@ -292,16 +292,16 @@ gst_switch_change_state (GstElement * element)
       }
     }
       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);
   else
-    return GST_STATE_SUCCESS;
+    return GST_STATE_CHANGE_SUCCESS;
 }
 
 /* =========================================== */
diff --git a/gst/videocrop/gstvideocrop.c b/gst/videocrop/gstvideocrop.c
index 6009ef7c0..2af4a76c1 100644
--- a/gst/videocrop/gstvideocrop.c
+++ b/gst/videocrop/gstvideocrop.c
@@ -107,7 +107,8 @@ static GstPadLinkReturn
 gst_video_crop_link (GstPad * pad, const GstCaps * caps);
 static void gst_video_crop_chain (GstPad * pad, GstData * _data);
 
-static GstElementStateReturn gst_video_crop_change_state (GstElement * element);
+static GstStateChangeReturn gst_video_crop_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -531,33 +532,33 @@ gst_video_crop_chain (GstPad * pad, GstData * _data)
   gst_pad_push (video_crop->srcpad, GST_DATA (outbuf));
 }
 
-static GstElementStateReturn
-gst_video_crop_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_video_crop_change_state (GstElement * element, GstStateChange transition)
 {
   GstVideoCrop *video_crop;
 
   video_crop = GST_VIDEO_CROP (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       video_crop->renegotiate_src_caps = TRUE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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 (parent_class->change_state != NULL)
-    return parent_class->change_state (element);
+    return parent_class->change_state (element, transition);
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 static gboolean
diff --git a/gst/videodrop/gstvideodrop.c b/gst/videodrop/gstvideodrop.c
index 447a1bc78..352e61d50 100644
--- a/gst/videodrop/gstvideodrop.c
+++ b/gst/videodrop/gstvideodrop.c
@@ -71,7 +71,8 @@ static void gst_videodrop_set_property (GObject * object,
 static void gst_videodrop_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_videodrop_change_state (GstElement * element);
+static GstStateChangeReturn gst_videodrop_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class = NULL;
 
@@ -347,13 +348,13 @@ gst_videodrop_get_property (GObject * object,
   }
 }
 
-static GstElementStateReturn
-gst_videodrop_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_videodrop_change_state (GstElement * element, GstStateChange transition)
 {
   GstVideodrop *videodrop = GST_VIDEODROP (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_PAUSED_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       videodrop->inited = FALSE;
       videodrop->time_adjust = 0;
       videodrop->total = videodrop->pass = 0;
@@ -363,9 +364,9 @@ gst_videodrop_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
diff --git a/gst/y4m/gsty4mencode.c b/gst/y4m/gsty4mencode.c
index c70d8c846..d2e38e3ae 100644
--- a/gst/y4m/gsty4mencode.c
+++ b/gst/y4m/gsty4mencode.c
@@ -68,7 +68,8 @@ static void gst_y4mencode_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
 static void gst_y4mencode_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_y4mencode_change_state (GstElement * element);
+static GstStateChangeReturn gst_y4mencode_change_state (GstElement * element,
+    GstStateChange transition);
 
 
 static GstElementClass *parent_class = NULL;
@@ -257,23 +258,23 @@ gst_y4mencode_get_property (GObject * object, guint prop_id, GValue * value,
   }
 }
 
-static GstElementStateReturn
-gst_y4mencode_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_y4mencode_change_state (GstElement * element, GstStateChange transition)
 {
   GstY4mEncode *filter;
 
-  g_return_val_if_fail (GST_IS_Y4MENCODE (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_Y4MENCODE (element), GST_STATE_CHANGE_FAILURE);
 
   filter = GST_Y4MENCODE (element);
 
-  if (GST_STATE_TRANSITION (element) == GST_STATE_NULL_TO_READY) {
+  if (transition == GST_STATE_CHANGE_NULL_TO_READY) {
     filter->init = TRUE;
   }
 
   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/po/af.po b/po/af.po
index 72f5bf02e..31022de25 100644
--- a/po/af.po
+++ b/po/af.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-03-18 14:16+0200\n"
 "Last-Translator: Petri Jooste <rkwjpj@puk.ac.za>\n"
 "Language-Team: Afrikaans <i18n@af.org.za>\n"
@@ -15,71 +15,71 @@ msgstr ""
 "Content-Type: text/plain; charset=iso-8859-1\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Kon nie l�er \"%s\" oopmaak om in te skryf nie."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Fout tydens toemaak van l�er \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Kon nie l�er \"%s\" oopmaak om te lees nie."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Geen l�ernaam gespesifiseer."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Kon nie skryf na l�er \"%s\" nie."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Kon nie oudio-toestel \"%s\" oopmaak vir skryf nie."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Kon nie beheertoestel \"%s\" oopmaak vir skryf nie."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Kon nie oudio-toestel \"%s\" konfigureer nie."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Kon nie klanktoestel \"%s\" verstel na %d Hz nie."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Kon nie oudio-toestel \"%s\" toemaak nie."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Kon nie beheertoestel \"%s\" toemaak nie."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Kon nie video-toestel \"%s\" oopmaak vir skryf nie."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Kon nie video-toestel \"%s\" toemaak nie."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Kon nie skryf na toestel \"%s\" nie."
diff --git a/po/az.po b/po/az.po
index f291988e3..b5bf74ada 100644
--- a/po/az.po
+++ b/po/az.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-03-19 18:29+0200\n"
 "Last-Translator: Metin Amiroff <metin@karegen.com>\n"
 "Language-Team: Azerbaijani <translation-team-az@lists.sourceforge.net>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "X-Generator: KBabel 1.0.2\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "\"%s\" faylı yazma üçün açıla bilmədi."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "\"%s\" faylı bağlana bilmədi."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "\"%s\" faylı oxuma üçün açıla bilmədi."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Fayl adı verilməyib."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "\"%s\" faylına yazıla bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "\"%s\" audio avadanlığı yazma üçün açıla bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "\"%s\" idarə avadanlığı yazma üçün açıla bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "\"%s\" audio avadanlığı quraşdırıla bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "\"%s\" audio avadanlığı %d Hz-ə keçirilə bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "\"%s\" audio avadanlığı bağlana bilmədi."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "\"%s\" idarə avadanlığı bağlana bilmədi."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "\"%s\" video avadanlığı yazma üçün açıla bilmədi."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "\"%s\" video avadanlığı bağlana bilmədi."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "\"%s\" avadanlığına yazıla bilmədi."
diff --git a/po/cs.po b/po/cs.po
index 00b9ea11d..d4add949e 100644
--- a/po/cs.po
+++ b/po/cs.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-08-08 22:58+0200\n"
 "Last-Translator: Miloslav Trmac <mitr@volny.cz>\n"
 "Language-Team: Czech <translation-team-cs@lists.sourceforge.net>\n"
@@ -18,71 +18,71 @@ msgstr ""
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Nemohu otevřít soubor \"%s\" pro zápis."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Chyba při zavírání souboru \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Nemohu otevřít soubor \"%s\" pro čtení."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Nezadán název souboru."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Nemohu zapisovat do souboru \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Nemohu otevřít zařízení zvuku \"%s\" pro zápis."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Nemohu otevřít řídicí zařízení \"%s\" pro zápis."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Nemohu nastavit zařízení zvuku \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Nemohu nastavit zařízení zvuku \"%s\" na %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Nemohu zavřít zařízení zvuku \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Nemohu zavřít řídicí zařízení \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Nemohu otevřít zařízení videa \"%s\" pro zápis."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Nemohu zavřít zařízení videa \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Nemohu zapisovat do zařízení \"%s\"."
diff --git a/po/en_GB.po b/po/en_GB.po
index eabc48228..16536ca18 100644
--- a/po/en_GB.po
+++ b/po/en_GB.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-04-26 10:41-0400\n"
 "Last-Translator: Gareth Owen <gowen72@yahoo.com>\n"
 "Language-Team: English (British) <en_gb@li.org>\n"
@@ -14,71 +14,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Could not open file \"%s\" for writing."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Error closing file \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Could not open file \"%s\" for reading."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "No filename specified."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Could not write to file \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Could not open audio device \"%s\" for writing."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Could not open control device \"%s\" for writing."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Could not configure audio device \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Could not set audio device \"%s\" to %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Could not close audio device \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Could not close control device \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Could not open video device \"%s\" for writing."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Could not close video device \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Could not write to device \"%s\"."
diff --git a/po/hu.po b/po/hu.po
index bfd53adb1..8d3f70bd2 100644
--- a/po/hu.po
+++ b/po/hu.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-07-18 11:03+0200\n"
 "Last-Translator: Laszlo Dvornik <dvornik@invitel.hu>\n"
 "Language-Team: Hungarian <translation-team-hu@lists.sourceforge.net>\n"
@@ -14,71 +14,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Nem lehet írásra megnyitni a(z) \"%s\" fájlt."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Hiba a(z) \"%s\" fájl bezárása közben."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Nem lehet olvasásra megnyitni a(z) \"%s\" fájlt."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Nincs fájlnév megadva."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Nem lehet írni a(z) \"%s\" fájlba."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Nem lehet írásra megnyitni a(z) \"%s\" audioeszközt."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Nem lehet írásra megnyitni a(z) \"%s\" vezérlőeszközt."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Nem lehet beállítani a(z) \"%s\" audioeszközt."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Nem lehet beállítani a(z) \"%s\" audioeszközt %d Hz-re."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Nem lehet lezárni a(z) \"%s\" audioeszközt."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Nem lehet lezárni a(z) \"%s\" vezérlőeszközt."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Nem lehet írásra megnyitni a(z) \"%s\" videoeszközt."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Nem lehet lezárni a(z) \"%s\" videoeszközt."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Nem lehet írni a(z) \"%s\" eszközre."
diff --git a/po/it.po b/po/it.po
index 67c219c34..111bf2045 100644
--- a/po/it.po
+++ b/po/it.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-11-07 19:11+0100\n"
 "Last-Translator: Luca Ferretti <elle.uca@infinito.it>\n"
 "Language-Team: Italian <tp@lists.linux.it>\n"
@@ -15,71 +15,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Impossibile aprire il file «%s» in scrittura."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Errore nel chiudere il file «%s»."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Impossibile aprire il file «%s» in lettura."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Nessun nome di file specificato."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Impossibile scrivere sul file «%s»."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Impossibile aprire il device audio «%s» in scrittura."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Impossibile aprire il device di controllo «%s» in scrittura."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Impossibile configurare il device audio «%s»."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Impossibile impostare il device audio «%s» a %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Impossibile chiudere il device audio «%s»."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Impossibile chiudere il device di controllo «%s»."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Impossibile aprire il device video «%s» in scrittura."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Impossibile chiudere il device video «%s»."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Impossibile scrivere sul device «%s»."
diff --git a/po/nb.po b/po/nb.po
index 1e0469171..fd53191c8 100644
--- a/po/nb.po
+++ b/po/nb.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-10-04 15:54+0200\n"
 "Last-Translator: Kjartan Maraas <kmaraas@broadpark.no>\n"
 "Language-Team: Norwegian Bokmaal <i18n-nb@lister.ping.uio.no>\n"
@@ -14,71 +14,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Kunne ikke åpne filen «%s» for skriving."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Feil under lukking av fil «%s»."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Kunne ikke åpne filen «%s» for lesing."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Ingen filnavn oppgitt."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Kunne ikke skrive til fil «%s»."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr ""
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr ""
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Kunne ikke konfigurere lydenhet «%s»."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr ""
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr ""
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr ""
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr ""
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr ""
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr ""
diff --git a/po/nl.po b/po/nl.po
index e7ab24f8a..67f63a3fe 100644
--- a/po/nl.po
+++ b/po/nl.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-08-05 16:26+0200\n"
 "Last-Translator: Elros Cyriatan <cyriatan@fastmail.fm>\n"
 "Language-Team: Dutch <vertaling@nl.linux.org>\n"
@@ -15,71 +15,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Kon \"%s\" niet openen om te schrijven."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Fout bij sluiten bestand \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Kon \"%s\" niet openen om te lezen."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Geen bestandsnaam opgegeven."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Kon niet schrijven naar bestand \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Kon geluidsapparaat \"%s\" niet openen om te schrijven."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Kon instelapparaat \"%s\" niet openen om te schrijven."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Kon geluidsapparaat \"%s\" niet configureren."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Kon geluidsapparaat \"%s\" niet instellen op %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Kon geluidsapparaat \"%s\" niet sluiten."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Kon instelapparaat \"%s\" niet sluiten."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Kon videoapparaat \"%s\" niet openen om te schrijven."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Kon videoapparaat \"%s\" niet sluiten."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Kon niet schrijven naar apparaat \"%s\"."
diff --git a/po/or.po b/po/or.po
index f1b08956c..def74230d 100644
--- a/po/or.po
+++ b/po/or.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-09-27 13:32+0530\n"
 "Last-Translator: Gora Mohanty <gora_mohanty@yahoo.co.in>\n"
 "Language-Team: Oriya <gora_mohanty@yahoo.co.in>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "\"%s\" ଫାଇଲ ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "\"%s\" ଫାଇଲ ବନ୍ଦ କରିବାରେ ତ୍ରୁଟି."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "\"%s\" ଫାଇଲ ପଢ଼ିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "କୌଣସି ଫାଇଲନାମ ଉଲ୍ଲେଖିତ ହୋଇ ନାହିଁ."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "\"%s\" ଫାଇଲ ଲେଖିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "\"%s\" ଧ୍ବନି ଯନ୍ତ୍ର ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "\"%s\" ନିୟନ୍ତ୍ରଣ ଯନ୍ତ୍ର ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "\"%s\" ଧ୍ବନି ଯନ୍ତ୍ର ବିନ୍ଯାସ କରିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "\"%s\" ଧ୍ବନି ଯନ୍ତ୍ରକୁ %d ହର୍ଜରେ ବିନ୍ଯାସ କରିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "\"%s\" ଧ୍ବନି ଯନ୍ତ୍ର ବନ୍ଦ କରିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "\"%s\" ନିୟନ୍ତ୍ରଣ ଯନ୍ତ୍ର ବନ୍ଦ କରିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "\"%s\" ଭିଡିଓ ଯନ୍ତ୍ର ଲେଖିବା ପାଇଁ ଖୋଲିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "\"%s\" ଭିଡିଓ ଯନ୍ତ୍ର ବନ୍ଦ କରିହେଲା ନାହିଁ."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "\"%s\" ଯନ୍ତ୍ରରେ ଲେଖିହେଲା ନାହିଁ."
diff --git a/po/sq.po b/po/sq.po
index 4ece80273..ec1d972d4 100644
--- a/po/sq.po
+++ b/po/sq.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-08-07 20:29+0200\n"
 "Last-Translator: Laurent Dhima <laurenti@alblinux.net>\n"
 "Language-Team: Albanian <begraj@hotmail.com>\n"
@@ -14,71 +14,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "E pamundur hapja e file \"%s\" në shkrim."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Gabim gjatë mbylljes së file \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "E pamundur hapja e file \"%s\" për lexim."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Nuk është përcaktuar emri i file."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "I pamundur shkrimi tek file \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "E pamundur hapja e dispozitivit të zërit \"%s\" për shkrim."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "E pamundur hapja e dispozitivit të kontrollit \"%s\" për shkrim."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "I pamundur konfigurimi i dispozitivit të zërit \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "I pamundur rregullimi i dispozitivit audio \"%s\" në %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "E pamundur mbyllja e dispozitivit audio \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "E pamundur mbyllja e dispozitivit të kontrollit \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "E pamundur hapja e dispozitivit video \"%s\" për shkrim."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "E pamundur mbyllja e dispozitivit video \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "I pamundur shkrimi në dispozitivin \"%s\"."
diff --git a/po/sr.po b/po/sr.po
index 76cd5da87..a36742e1b 100644
--- a/po/sr.po
+++ b/po/sr.po
@@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.7.6\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-03-13 00:18+0100\n"
 "Last-Translator: Danilo Segan <dsegan@gmx.net>\n"
 "Language-Team: Serbian <gnu@prevod.org>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Plural-Forms: nplurals=3;    plural=n%10==1 && n%100!=11 ? 0 :  (n%10>=2 && n"
 "%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Не могу да отворим датотеку „%s“ ради уписа."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Грешка при затварању датотеке „%s“."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Не могу да отворим датотеку „%s“ ради читања."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Име датотеке није задато."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Не могу да пишем у датотеку „%s“."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Не могу да отворим звучни уређај „%s“ ради уписа."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Не могу да отворим управљачки уређај „%s“ ради уписа."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Не могу да подесим звучни уређај „%s“."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Не могу да поставим звучни уређај „%s“ на %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Не могу да отворим радио уређај '%s'"
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Не могу да затворим управљачки уређај „%s“."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Не могу да отворим видео уређај „%s“ ради уписа."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Не могу да затворим видео уређај „%s“."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Не могу да пишем на видео уређај „%s“."
diff --git a/po/sv.po b/po/sv.po
index 3f11e6d15..53bdb893e 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -2,13 +2,13 @@
 # Copyright (C) 2004 Free Software Foundation, Inc.
 # Christian Rose <menthos@menthos.com>, 2004.
 #
-# $Id: sv.po,v 1.20 2005/08/31 18:07:28 thomasvs Exp $
+# $Id: sv.po,v 1.21 2005/09/05 17:20:27 thaytan Exp $
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-08-03 20:53+0200\n"
 "Last-Translator: Christian Rose <menthos@menthos.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Kunde inte öppna filen \"%s\" för skrivning."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Fel vid stängning av filen \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Kunde inte öppna filen \"%s\" för läsning."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Inget filnamn angivet."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Kunde inte skriva till filen \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Kunde inte öppna ljudenheten \"%s\" för skrivning."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Kunde inte öppna styrenheten \"%s\" för skrivning."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Kunde inte konfigurera ljudenheten \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Kan inte ställa in ljudenheten \"%s\" till %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Kunde inte stänga ljudenheten \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Kunde inte stänga styrenheten \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Kunde inte öppna videoenheten \"%s\" för skrivning."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Kunde inte stänga vidoeenheten \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Kunde inte skriva till enheten \"%s\"."
diff --git a/po/uk.po b/po/uk.po
index cac0a0c0b..e2976ae25 100644
--- a/po/uk.po
+++ b/po/uk.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins 0.8.2\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2004-08-03 15:40+0200\n"
 "Last-Translator: Maxim V. Dziumanenko <mvd@mylinux.com.ua>\n"
 "Language-Team: Ukrainian <translation-team-uk@lists.sourceforge.net>\n"
@@ -15,71 +15,71 @@ msgstr ""
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Не вдається відкрити файл \"%s\" для запису."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Помилка закривання файлу \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Не вдається відкрити файл \"%s\" для читання."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Не вказаний файл."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Не вдається записати у файл \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Не вдається відкрити звуковий пристрій \"%s\" для запису."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Не вдається відкрити пристрій керування \"%s\" для запису."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Не вдається настроїти звуковий пристрій \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Не вдається встановити частоту \"%s\" у %d Гц."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Не вдається закрити звуковий пристрій \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Не вдається закрити пристрій керування \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Не вдається відкрити відео пристрій \"%s\" для запису."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Не вдається закрити відео пристрій \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Не вдається записати у пристрій \"%s\"."
diff --git a/po/vi.po b/po/vi.po
index f2ac86f8e..356b53ed9 100644
--- a/po/vi.po
+++ b/po/vi.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: gst-plugins-0.8.3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2005-08-31 16:10+0200\n"
+"POT-Creation-Date: 2005-09-05 18:47+0200\n"
 "PO-Revision-Date: 2005-01-22 17:17+0930\n"
 "Last-Translator: Clytie Siddall <clytie@riverland.net.au>\n"
 "Language-Team: Vietnamese <gnomevi-list@lists.sourceforge.net> \n"
@@ -16,71 +16,71 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 
-#: ext/audiofile/gstafsink.c:342 ext/sndfile/gstsf.c:624
+#: ext/audiofile/gstafsink.c:343 ext/sndfile/gstsf.c:625
 #, c-format
 msgid "Could not open file \"%s\" for writing."
 msgstr "Đã không mở được tập tin \"%s\" để ghi."
 
-#: ext/audiofile/gstafsink.c:364 ext/audiofile/gstafsrc.c:369
+#: ext/audiofile/gstafsink.c:365 ext/audiofile/gstafsrc.c:370
 #, c-format
 msgid "Error closing file \"%s\"."
 msgstr "Lỗi khi đóng tập tin \"%s\"."
 
-#: ext/audiofile/gstafsrc.c:316
+#: ext/audiofile/gstafsrc.c:317
 #, c-format
 msgid "Could not open file \"%s\" for reading."
 msgstr "Đã không mở được tập tin \"%s\" để đọc."
 
-#: ext/sndfile/gstsf.c:585
+#: ext/sndfile/gstsf.c:586
 msgid "No filename specified."
 msgstr "Chưa ghi rõ tên tập tin."
 
-#: ext/sndfile/gstsf.c:838
+#: ext/sndfile/gstsf.c:839
 #, c-format
 msgid "Could not write to file \"%s\"."
 msgstr "Đã không ghi được vào tập tin \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:296
+#: sys/dxr3/dxr3audiosink.c:297
 #, c-format
 msgid "Could not open audio device \"%s\" for writing."
 msgstr "Đã không mở được thiết bị âm thanh \"%s\" để ghi."
 
-#: sys/dxr3/dxr3audiosink.c:308 sys/dxr3/dxr3videosink.c:281
+#: sys/dxr3/dxr3audiosink.c:309 sys/dxr3/dxr3videosink.c:282
 #, c-format
 msgid "Could not open control device \"%s\" for writing."
 msgstr "Đã không mở được thiết bị điều khiển \"%s\" để ghi."
 
-#: sys/dxr3/dxr3audiosink.c:341
+#: sys/dxr3/dxr3audiosink.c:342
 #, c-format
 msgid "Could not configure audio device \"%s\"."
 msgstr "Đã không định cầu hình được thiết bị âm thanh \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:355 sys/dxr3/dxr3audiosink.c:392
+#: sys/dxr3/dxr3audiosink.c:356 sys/dxr3/dxr3audiosink.c:393
 #, c-format
 msgid "Could not set audio device \"%s\" to %d Hz."
 msgstr "Đã không đặt được thiết bị âm thanh \"%s\" thành %d Hz."
 
-#: sys/dxr3/dxr3audiosink.c:420
+#: sys/dxr3/dxr3audiosink.c:421
 #, c-format
 msgid "Could not close audio device \"%s\"."
 msgstr "Đã không đóng được thiết bị âm thanh \"%s\"."
 
-#: sys/dxr3/dxr3audiosink.c:427 sys/dxr3/dxr3videosink.c:306
+#: sys/dxr3/dxr3audiosink.c:428 sys/dxr3/dxr3videosink.c:307
 #, c-format
 msgid "Could not close control device \"%s\"."
 msgstr "Đã không đóng được thiết bị điều khiển \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:269
+#: sys/dxr3/dxr3videosink.c:270
 #, c-format
 msgid "Could not open video device \"%s\" for writing."
 msgstr "Đã không mở được thiết bị ảnh động \"%s\" để ghi."
 
-#: sys/dxr3/dxr3videosink.c:299
+#: sys/dxr3/dxr3videosink.c:300
 #, c-format
 msgid "Could not close video device \"%s\"."
 msgstr "Đã không đóng được thiết bị ảnh động \"%s\"."
 
-#: sys/dxr3/dxr3videosink.c:451
+#: sys/dxr3/dxr3videosink.c:452
 #, c-format
 msgid "Could not write to device \"%s\"."
 msgstr "Đã không ghi được vào thiết bị \"%s\"."
diff --git a/sys/cdrom/gstcdplayer.c b/sys/cdrom/gstcdplayer.c
index bf3b37b5c..b67362df2 100644
--- a/sys/cdrom/gstcdplayer.c
+++ b/sys/cdrom/gstcdplayer.c
@@ -52,7 +52,8 @@ static void cdplayer_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * spec);
 static gboolean cdplayer_iterate (GstBin * bin);
 
-static GstElementStateReturn cdplayer_change_state (GstElement * element);
+static GstStateChangeReturn cdplayer_change_state (GstElement * element,
+    GstStateChange transition);
 
 static GstElementClass *parent_class;
 static guint cdplayer_signals[LAST_SIGNAL] = { 0 };
@@ -285,14 +286,14 @@ cdplayer_iterate (GstBin * bin)
 }
 
 
-static GstElementStateReturn
-cdplayer_change_state (GstElement * element)
+static GstStateChangeReturn
+cdplayer_change_state (GstElement * element, GstStateChange transition)
 {
   CDPlayer *cdp;
-  GstElementState state = GST_STATE (element);
-  GstElementState pending = GST_STATE_PENDING (element);
+  GstState state = GST_STATE (element);
+  GstState pending = GST_STATE_PENDING (element);
 
-  g_return_val_if_fail (GST_IS_CDPLAYER (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_CDPLAYER (element), GST_STATE_CHANGE_FAILURE);
 
   cdp = CDPLAYER (element);
 
@@ -300,7 +301,7 @@ cdplayer_change_state (GstElement * element)
     case GST_STATE_READY:
       if (state != GST_STATE_PAUSED) {
         if (cd_init (CDPLAYER_CD (cdp), cdp->device) == FALSE) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
         cdp->num_tracks = cdp->cd.num_tracks;
         cdp->cddb_discid = cd_cddb_discid (CDPLAYER_CD (cdp));
@@ -310,7 +311,7 @@ cdplayer_change_state (GstElement * element)
       /* ready->paused is not useful */
       if (state != GST_STATE_READY) {
         if (cd_pause (CDPLAYER_CD (cdp)) == FALSE) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
 
         cdp->paused = TRUE;
@@ -320,14 +321,14 @@ cdplayer_change_state (GstElement * element)
     case GST_STATE_PLAYING:
       if (cdp->paused == TRUE) {
         if (cd_resume (CDPLAYER_CD (cdp)) == FALSE) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
 
         cdp->paused = FALSE;
       } else {
         if (cd_start (CDPLAYER_CD (cdp), cdp->start_track,
                 cdp->end_track) == FALSE) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
       }
 
@@ -336,7 +337,7 @@ cdplayer_change_state (GstElement * element)
       /* stop & close fd */
       if (cd_stop (CDPLAYER_CD (cdp)) == FALSE
           || cd_close (CDPLAYER_CD (cdp)) == FALSE) {
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
 
       break;
@@ -345,10 +346,10 @@ cdplayer_change_state (GstElement * element)
   }
 
   if (GST_ELEMENT_CLASS (parent_class)->change_state) {
-    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;
 }
 
 
diff --git a/sys/dxr3/dxr3audiosink.c b/sys/dxr3/dxr3audiosink.c
index 144e50c11..2e7026f9d 100644
--- a/sys/dxr3/dxr3audiosink.c
+++ b/sys/dxr3/dxr3audiosink.c
@@ -118,7 +118,8 @@ static void dxr3audiosink_chain_ac3 (GstPad * pad, GstData * buf);
 /* static int	dxr3audiosink_mvcommand		(Dxr3AudioSink *sink, */
 /*                                                  int command); */
 
-static GstElementStateReturn dxr3audiosink_change_state (GstElement * element);
+static GstStateChangeReturn dxr3audiosink_change_state (GstElement * element,
+    GstStateChange transition);
 
 static void dxr3audiosink_flushed (Dxr3AudioSink * sink);
 
@@ -701,10 +702,11 @@ dxr3audiosink_mvcommand (Dxr3AudioSink * sink, int command)
 }
 #endif
 
-static GstElementStateReturn
-dxr3audiosink_change_state (GstElement * element)
+static GstStateChangeReturn
+dxr3audiosink_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_DXR3AUDIOSINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_DXR3AUDIOSINK (element),
+      GST_STATE_CHANGE_FAILURE);
 
   if (GST_STATE_PENDING (element) == GST_STATE_NULL) {
     if (GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
@@ -713,16 +715,16 @@ dxr3audiosink_change_state (GstElement * element)
   } else {
     if (!GST_FLAG_IS_SET (element, DXR3AUDIOSINK_OPEN)) {
       if (!dxr3audiosink_open (DXR3AUDIOSINK (element))) {
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
     }
   }
 
   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/sys/dxr3/dxr3spusink.c b/sys/dxr3/dxr3spusink.c
index 023631d2e..badc2e41e 100644
--- a/sys/dxr3/dxr3spusink.c
+++ b/sys/dxr3/dxr3spusink.c
@@ -87,7 +87,8 @@ static void dxr3spusink_set_clock (GstElement * element, GstClock * clock);
 static gboolean dxr3spusink_handle_event (GstPad * pad, GstEvent * event);
 static void dxr3spusink_chain (GstPad * pad, GstData * _data);
 
-static GstElementStateReturn dxr3spusink_change_state (GstElement * element);
+static GstStateChangeReturn dxr3spusink_change_state (GstElement * element,
+    GstStateChange transition);
 
 /* static void	dxr3spusink_wait		(Dxr3SpuSink *sink, */
 /*                                                  GstClockTime time); */
@@ -397,28 +398,28 @@ dxr3spusink_chain (GstPad * pad, GstData * _data)
 }
 
 
-static GstElementStateReturn
-dxr3spusink_change_state (GstElement * element)
+static GstStateChangeReturn
+dxr3spusink_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_DXR3SPUSINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_DXR3SPUSINK (element), GST_STATE_CHANGE_FAILURE);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
         if (!dxr3spusink_open (DXR3SPUSINK (element))) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
       }
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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:
       if (GST_FLAG_IS_SET (element, DXR3SPUSINK_OPEN)) {
         dxr3spusink_close (DXR3SPUSINK (element));
       }
@@ -426,10 +427,10 @@ dxr3spusink_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;
 }
 
 #if 0
diff --git a/sys/dxr3/dxr3videosink.c b/sys/dxr3/dxr3videosink.c
index 37e28192a..c2222e85c 100644
--- a/sys/dxr3/dxr3videosink.c
+++ b/sys/dxr3/dxr3videosink.c
@@ -117,7 +117,8 @@ static void dxr3videosink_parse_data (Dxr3VideoSink * sink);
 static gboolean dxr3videosink_handle_event (GstPad * pad, GstEvent * event);
 static void dxr3videosink_chain (GstPad * pad, GstData * _data);
 
-static GstElementStateReturn dxr3videosink_change_state (GstElement * element);
+static GstStateChangeReturn dxr3videosink_change_state (GstElement * element,
+    GstStateChange transition);
 
 /* static void	dxr3videosink_wait		(Dxr3VideoSink *sink, */
 /*                                                  GstClockTime time); */
@@ -633,32 +634,33 @@ dxr3videosink_chain (GstPad * pad, GstData * _data)
 }
 
 
-static GstElementStateReturn
-dxr3videosink_change_state (GstElement * element)
+static GstStateChangeReturn
+dxr3videosink_change_state (GstElement * element, GstStateChange transition)
 {
-  g_return_val_if_fail (GST_IS_DXR3VIDEOSINK (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_DXR3VIDEOSINK (element),
+      GST_STATE_CHANGE_FAILURE);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
         if (!dxr3videosink_open (DXR3VIDEOSINK (element))) {
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
         }
       }
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_PAUSE);
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_START);
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_PAUSE);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       dxr3videosink_mvcommand (DXR3VIDEOSINK (element), MVCOMMAND_STOP);
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       if (GST_FLAG_IS_SET (element, DXR3VIDEOSINK_OPEN)) {
         dxr3videosink_close (DXR3VIDEOSINK (element));
       }
@@ -666,10 +668,10 @@ dxr3videosink_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;
 }
 
 #if 0
diff --git a/sys/glsink/glimagesink.c b/sys/glsink/glimagesink.c
index e94bf1ae4..01018b5e4 100644
--- a/sys/glsink/glimagesink.c
+++ b/sys/glsink/glimagesink.c
@@ -935,8 +935,8 @@ gst_glimagesink_sink_link (GstPad * pad, const GstCaps * caps)
   return GST_PAD_LINK_OK;
 }
 
-static GstElementStateReturn
-gst_glimagesink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_glimagesink_change_state (GstElement * element, GstStateChange transition)
 {
   GstGLImageSink *glimagesink;
 
@@ -944,32 +944,32 @@ gst_glimagesink_change_state (GstElement * element)
 
   glimagesink = GST_GLIMAGESINK (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       /* Initializing the XContext */
       if (!glimagesink->xcontext) {
         glimagesink->xcontext = gst_glimagesink_xcontext_get (glimagesink);
         if (!glimagesink->xcontext)
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
       }
       printf ("null to ready done\n");
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       printf ("ready to paused\n");
       //if (glimagesink->window) // not needed with OpenGL
       //  gst_glimagesink_xwindow_clear (glimagesink, glimagesink->window);
       glimagesink->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:
       glimagesink->framerate = 0;
       GST_VIDEOSINK_WIDTH (glimagesink) = 0;
       GST_VIDEOSINK_HEIGHT (glimagesink) = 0;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       if (glimagesink->glimage) {
         gst_glimagesink_ximage_destroy (glimagesink, glimagesink->glimage);
         glimagesink->glimage = NULL;
@@ -991,9 +991,9 @@ gst_glimagesink_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 void
diff --git a/sys/qcam/gstqcamsrc.c b/sys/qcam/gstqcamsrc.c
index 2fab71d99..e34a589ec 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
diff --git a/sys/sunaudio/gstsunaudio.c b/sys/sunaudio/gstsunaudio.c
index 432fc635d..945d797d3 100644
--- a/sys/sunaudio/gstsunaudio.c
+++ b/sys/sunaudio/gstsunaudio.c
@@ -120,7 +120,7 @@ static void gst_sunaudiosink_get_property (GObject * object, guint prop_id,
 
 static gboolean gst_sunaudiosink_setparams (GstSunAudioSink * sunaudiosink);
 static void gst_sunaudiosink_chain (GstPad * pad, GstData * _data);
-static GstElementStateReturn gst_sunaudiosink_change_state (GstElement *
+static GstStateChangeReturn gst_sunaudiosink_change_state (GstElement *
     element);
 
 static GstElementClass *parent_class = NULL;
@@ -357,34 +357,34 @@ gst_sunaudiosink_close (GstSunAudioSink * sunaudiosink)
   close (sunaudiosink->fd);
 }
 
-static GstElementStateReturn
-gst_sunaudiosink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sunaudiosink_change_state (GstElement * element, GstStateChange transition)
 {
   GstSunAudioSink *sunaudiosink = GST_SUNAUDIOSINK (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_sunaudiosink_open (sunaudiosink)) {
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       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:
       gst_sunaudiosink_close (sunaudiosink);
       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 void
diff --git a/sys/sunaudio/gstsunaudiosrc.c b/sys/sunaudio/gstsunaudiosrc.c
index ff9e236da..6a54d2dc7 100644
--- a/sys/sunaudio/gstsunaudiosrc.c
+++ b/sys/sunaudio/gstsunaudiosrc.c
@@ -67,8 +67,7 @@ static void gst_sunaudiosrc_set_property (GObject * object, guint prop_id,
 static void gst_sunaudiosrc_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_sunaudiosrc_change_state (GstElement *
-    element);
+static GstStateChangeReturn gst_sunaudiosrc_change_state (GstElement * element);
 
 static gboolean gst_sunaudiosrc_setparams (GstSunAudioSrc * sunaudiosrc);
 static GstData *gst_sunaudiosrc_get (GstPad * pad);
@@ -210,30 +209,30 @@ gst_sunaudiosrc_get_property (GObject * object, guint prop_id,
   }
 }
 
-static GstElementStateReturn
-gst_sunaudiosrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sunaudiosrc_change_state (GstElement * element, GstStateChange transition)
 {
   GstSunAudioSrc *sunaudiosrc = GST_SUNAUDIOSRC (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:
       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/sys/sunaudio/gstsunelement.c b/sys/sunaudio/gstsunelement.c
index 641840413..fbbd3e8ea 100644
--- a/sys/sunaudio/gstsunelement.c
+++ b/sys/sunaudio/gstsunelement.c
@@ -65,7 +65,7 @@ static void gst_sunaudioelement_set_property (GObject * object,
 static void gst_sunaudioelement_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
-static GstElementStateReturn gst_sunaudioelement_change_state (GstElement *
+static GstStateChangeReturn gst_sunaudioelement_change_state (GstElement *
     element);
 
 static GstElementClass *parent_class = NULL;
@@ -417,19 +417,20 @@ gst_sunaudioelement_dispose (GObject * object)
   G_OBJECT_CLASS (parent_class)->dispose (object);
 }
 
-static GstElementStateReturn
-gst_sunaudioelement_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_sunaudioelement_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstSunAudioElement *sunaudio = GST_SUNAUDIOELEMENT (element);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_sunaudioelement_open_audio (sunaudio)) {
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       }
       GST_INFO ("opened sound device");
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       gst_sunaudioelement_close_audio (sunaudio);
       gst_sunaudioelement_reset (sunaudio);
       GST_INFO ("closed sound device");
@@ -439,9 +440,9 @@ gst_sunaudioelement_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
diff --git a/sys/v4l2/gstv4l2element.c b/sys/v4l2/gstv4l2element.c
index 18c0abd93..139378b31 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;
 }
diff --git a/sys/v4l2/gstv4l2src.c b/sys/v4l2/gstv4l2src.c
index 45b60bdea..b273781d8 100644
--- a/sys/v4l2/gstv4l2src.c
+++ b/sys/v4l2/gstv4l2src.c
@@ -123,7 +123,8 @@ static void gst_v4l2src_get_property (GObject * object,
     guint prop_id, GValue * value, GParamSpec * pspec);
 
 /* state handling */
-static GstElementStateReturn gst_v4l2src_change_state (GstElement * element);
+static GstStateChangeReturn gst_v4l2src_change_state (GstElement * element,
+    GstStateChange transition);
 
 /* set_clock function for A/V sync */
 static void gst_v4l2src_set_clock (GstElement * element, GstClock * clock);
@@ -1014,63 +1015,63 @@ gst_v4l2src_get_property (GObject * object,
 }
 
 
-static GstElementStateReturn
-gst_v4l2src_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_v4l2src_change_state (GstElement * element, GstStateChange transition)
 {
   GstV4l2Src *v4l2src;
-  gint transition = GST_STATE_TRANSITION (element);
-  GstElementStateReturn parent_return;
+  GstStateChangeReturn parent_return;
   GTimeVal time;
 
-  g_return_val_if_fail (GST_IS_V4L2SRC (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_V4L2SRC (element), GST_STATE_CHANGE_FAILURE);
   v4l2src = GST_V4L2SRC (element);
 
   if (GST_ELEMENT_CLASS (parent_class)->change_state) {
-    parent_return = GST_ELEMENT_CLASS (parent_class)->change_state (element);
-    if (parent_return != GST_STATE_SUCCESS)
+    parent_return =
+        GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
+    if (parent_return != GST_STATE_CHANGE_SUCCESS)
       return parent_return;
   }
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_v4l2src_get_capture (v4l2src))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       v4l2src->handled = 0;
       v4l2src->need_writes = 0;
       v4l2src->substract_time = 0;
       /* buffer setup moved to capsnego */
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
       /* queue all buffer, start streaming capture */
       if (GST_V4L2ELEMENT (v4l2src)->buffer &&
           !gst_v4l2src_capture_start (v4l2src))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       g_get_current_time (&time);
       v4l2src->substract_time = GST_TIMEVAL_TO_TIME (time) -
           v4l2src->substract_time;
       v4l2src->last_seq = 0;
       break;
-    case GST_STATE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
       g_get_current_time (&time);
       v4l2src->substract_time = GST_TIMEVAL_TO_TIME (time) -
           v4l2src->substract_time;
       /* de-queue all queued buffers */
       if (v4l2src->is_capturing && !gst_v4l2src_capture_stop (v4l2src))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       /* stop capturing, unmap all buffers */
       if (GST_V4L2ELEMENT (v4l2src)->buffer &&
           !gst_v4l2src_capture_deinit (v4l2src))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
   }
 
-  return GST_STATE_SUCCESS;
+  return GST_STATE_CHANGE_SUCCESS;
 }
 
 
diff --git a/sys/vcd/vcdsrc.c b/sys/vcd/vcdsrc.c
index 60db1bc14..a6f06b884 100644
--- a/sys/vcd/vcdsrc.c
+++ b/sys/vcd/vcdsrc.c
@@ -78,7 +78,8 @@ static gboolean gst_vcdsrc_srcpad_query (GstPad * pad, GstQueryType type,
     GstFormat * format, gint64 * value);
 
 static GstData *gst_vcdsrc_get (GstPad * pad);
-static GstElementStateReturn gst_vcdsrc_change_state (GstElement * element);
+static GstStateChangeReturn gst_vcdsrc_change_state (GstElement * element,
+    GstStateChange transition);
 static inline guint64 gst_vcdsrc_msf (GstVCDSrc * vcdsrc, gint track);
 static void gst_vcdsrc_recalculate (GstVCDSrc * vcdsrc);
 
@@ -544,33 +545,33 @@ gst_vcdsrc_close_file (GstVCDSrc * src)
   GST_FLAG_UNSET (src, VCDSRC_OPEN);
 }
 
-static GstElementStateReturn
-gst_vcdsrc_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_vcdsrc_change_state (GstElement * element, GstStateChange transition)
 {
   GstVCDSrc *vcdsrc = GST_VCDSRC (element);
 
-  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, VCDSRC_OPEN))
         gst_vcdsrc_close_file (vcdsrc);
       break;
-    case GST_STATE_PAUSED_TO_READY:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
       vcdsrc->curoffset = 0;
       vcdsrc->discont = vcdsrc->flush = FALSE;
       break;
-    case GST_STATE_NULL_TO_READY:
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!GST_FLAG_IS_SET (element, VCDSRC_OPEN))
         if (!gst_vcdsrc_open_file (vcdsrc))
-          return GST_STATE_FAILURE;
+          return GST_STATE_CHANGE_FAILURE;
       break;
     default:
       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 inline guint64