3 files changed, 25 insertions, 22 deletions
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;
 }