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/autodetect/gstautoaudiosink.c | 26 ++++++++++++++------------
 gst/autodetect/gstautovideosink.c | 26 ++++++++++++++------------
 2 files changed, 28 insertions(+), 24 deletions(-)

(limited to 'gst/autodetect')

diff --git a/gst/autodetect/gstautoaudiosink.c b/gst/autodetect/gstautoaudiosink.c
index f5462495..83c0d48b 100644
--- a/gst/autodetect/gstautoaudiosink.c
+++ b/gst/autodetect/gstautoaudiosink.c
@@ -26,8 +26,9 @@
 #include "gstautoaudiosink.h"
 #include "gstautodetect.h"
 
-static GstElementStateReturn
-gst_auto_audio_sink_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_auto_audio_sink_change_state (GstElement * element,
+    GstStateChange transition);
 
 GST_BOILERPLATE (GstAutoAudioSink, gst_auto_audio_sink, GstBin, GST_TYPE_BIN);
 
@@ -170,7 +171,8 @@ gst_auto_audio_sink_find_best (GstAutoAudioSink * sink)
             }
           }
           GST_LOG ("Testing %s", GST_PLUGIN_FEATURE (f)->name);
-          if (gst_element_set_state (el, GST_STATE_READY) == GST_STATE_SUCCESS) {
+          if (gst_element_set_state (el,
+                  GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS) {
             gst_element_set_state (el, GST_STATE_NULL);
             GST_LOG ("This worked!");
             choice = el;
@@ -225,25 +227,25 @@ gst_auto_audio_sink_detect (GstAutoAudioSink * sink)
   return TRUE;
 }
 
-static GstElementStateReturn
-gst_auto_audio_sink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_auto_audio_sink_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstAutoAudioSink *sink = GST_AUTO_AUDIO_SINK (element);
 
-  GST_DEBUG_OBJECT (element, "Change state 0x%x",
-      GST_STATE_TRANSITION (element));
+  GST_DEBUG_OBJECT (element, "Change state 0x%x", transition);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_auto_audio_sink_detect (sink))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       gst_auto_audio_sink_reset (sink);
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
diff --git a/gst/autodetect/gstautovideosink.c b/gst/autodetect/gstautovideosink.c
index 76ec7500..6a6cace5 100644
--- a/gst/autodetect/gstautovideosink.c
+++ b/gst/autodetect/gstautovideosink.c
@@ -26,8 +26,9 @@
 #include "gstautovideosink.h"
 #include "gstautodetect.h"
 
-static GstElementStateReturn
-gst_auto_video_sink_change_state (GstElement * element);
+static GstStateChangeReturn
+gst_auto_video_sink_change_state (GstElement * element,
+    GstStateChange transition);
 
 GST_BOILERPLATE (GstAutoVideoSink, gst_auto_video_sink, GstBin, GST_TYPE_BIN);
 
@@ -143,7 +144,8 @@ gst_auto_video_sink_find_best (GstAutoVideoSink * sink)
     GST_DEBUG_OBJECT (sink, "Trying %s", GST_PLUGIN_FEATURE (f)->name);
     if ((el = gst_element_factory_create (f, "actual-sink"))) {
       GST_DEBUG_OBJECT (sink, "Changing state to READY");
-      if (gst_element_set_state (el, GST_STATE_READY) == GST_STATE_SUCCESS) {
+      if (gst_element_set_state (el,
+              GST_STATE_READY) == GST_STATE_CHANGE_SUCCESS) {
         GST_DEBUG_OBJECT (sink, "success");
         return el;
       }
@@ -186,25 +188,25 @@ gst_auto_video_sink_detect (GstAutoVideoSink * sink)
   return TRUE;
 }
 
-static GstElementStateReturn
-gst_auto_video_sink_change_state (GstElement * element)
+static GstStateChangeReturn
+gst_auto_video_sink_change_state (GstElement * element,
+    GstStateChange transition)
 {
   GstAutoVideoSink *sink = GST_AUTO_VIDEO_SINK (element);
 
-  GST_DEBUG_OBJECT (element, "Change state 0x%x",
-      GST_STATE_TRANSITION (element));
+  GST_DEBUG_OBJECT (element, "Change state 0x%x", transition);
 
-  switch (GST_STATE_TRANSITION (element)) {
-    case GST_STATE_NULL_TO_READY:
+  switch (transition) {
+    case GST_STATE_CHANGE_NULL_TO_READY:
       if (!gst_auto_video_sink_detect (sink))
-        return GST_STATE_FAILURE;
+        return GST_STATE_CHANGE_FAILURE;
       break;
-    case GST_STATE_READY_TO_NULL:
+    case GST_STATE_CHANGE_READY_TO_NULL:
       gst_auto_video_sink_reset (sink);
       break;
     default:
       break;
   }
 
-  return GST_ELEMENT_CLASS (parent_class)->change_state (element);
+  return GST_ELEMENT_CLASS (parent_class)->change_state (element, transition);
 }
-- 
cgit