From 7ebd7b97d480d4047051c29ad5213791b7620f6c Mon Sep 17 00:00:00 2001
From: Andy Wingo <wingo@pobox.com>
Date: Fri, 2 Sep 2005 15:44:50 +0000
Subject: All plugins updated for element state changes.

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

* All plugins updated for element state changes.
---
 gst/multipart/multipartdemux.c | 23 ++++++++++++-----------
 gst/multipart/multipartmux.c   | 26 +++++++++++++-------------
 2 files changed, 25 insertions(+), 24 deletions(-)

(limited to 'gst/multipart')

diff --git a/gst/multipart/multipartdemux.c b/gst/multipart/multipartdemux.c
index 938cc097..5eadf866 100644
--- a/gst/multipart/multipartdemux.c
+++ b/gst/multipart/multipartdemux.c
@@ -119,7 +119,7 @@ static void gst_multipart_demux_finalize (GObject * object);
 
 static void gst_multipart_demux_chain (GstPad * pad, GstData * buffer);
 
-static GstElementStateReturn gst_multipart_demux_change_state (GstElement *
+static GstStateChangeReturn gst_multipart_demux_change_state (GstElement *
     element);
 
 
@@ -336,36 +336,37 @@ gst_multipart_demux_chain (GstPad * pad, GstData * buffer)
   gst_buffer_unref (buffer);
 }
 
-static GstElementStateReturn
-gst_multipart_demux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_multipart_demux_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstMultipartDemux *multipart;
 
   multipart = GST_MULTIPART_DEMUX (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:
       multipart->buffer = g_malloc (multipart->maxlen);
       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:
       g_free (multipart->parsing_mime);
       multipart->parsing_mime = NULL;
       g_free (multipart->buffer);
       multipart->buffer = NULL;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       break;
     default:
       break;
   }
 
-  return parent_class->change_state (element);
+  return parent_class->change_state (element, transition);
 }
 
 gboolean
diff --git a/gst/multipart/multipartmux.c b/gst/multipart/multipartmux.c
index 39f3ac15..a8a6c401 100644
--- a/gst/multipart/multipartmux.c
+++ b/gst/multipart/multipartmux.c
@@ -121,7 +121,7 @@ static void gst_multipart_mux_set_property (GObject * object, guint prop_id,
     const GValue * value, GParamSpec * pspec);
 static void gst_multipart_mux_get_property (GObject * object, guint prop_id,
     GValue * value, GParamSpec * pspec);
-static GstElementStateReturn gst_multipart_mux_change_state (GstElement *
+static GstStateChangeReturn gst_multipart_mux_change_state (GstElement *
     element);
 
 static GstElementClass *parent_class = NULL;
@@ -563,33 +563,33 @@ gst_multipart_mux_set_property (GObject * object,
   }
 }
 
-static GstElementStateReturn
-gst_multipart_mux_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_multipart_mux_change_state (GstElement * element, GstStateChange transition)
 {
   GstMultipartMux *multipart_mux;
-  gint transition = GST_STATE_TRANSITION (element);
 
-  g_return_val_if_fail (GST_IS_MULTIPART_MUX (element), GST_STATE_FAILURE);
+  g_return_val_if_fail (GST_IS_MULTIPART_MUX (element),
+      GST_STATE_CHANGE_FAILURE);
 
   multipart_mux = GST_MULTIPART_MUX (element);
 
   switch (transition) {
-    case GST_STATE_NULL_TO_READY:
-    case GST_STATE_READY_TO_PAUSED:
+    case GST_STATE_CHANGE_NULL_TO_READY:
+    case GST_STATE_CHANGE_READY_TO_PAUSED:
       multipart_mux->offset = 0;
       multipart_mux->negotiated = FALSE;
       break;
-    case GST_STATE_PAUSED_TO_PLAYING:
-    case GST_STATE_PLAYING_TO_PAUSED:
-    case GST_STATE_PAUSED_TO_READY:
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+    case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
+    case GST_STATE_CHANGE_PAUSED_TO_READY:
+    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;
 }
 
 gboolean
-- 
cgit