gst/alpha/gstalpha.c: Don't ignore return value of the parent class's state

Original commit message from CVS:
* gst/alpha/gstalpha.c: (gst_alpha_change_state):
Don't ignore return value of the parent class's state
change function (#331385, patch by: Wouter Paesen).

diff --git a/ChangeLog b/ChangeLog
index ba17558..b59d12a 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2006-02-16  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/alpha/gstalpha.c: (gst_alpha_change_state):
+         Don't ignore return value of the parent class's state
+         change function (#331385, patch by: Wouter Paesen).
+
 2006-02-15  Wim Taymans  <wim@fluendo.com>
 
        * configure.ac:

diff --git a/gst/alpha/gstalpha.c b/gst/alpha/gstalpha.c
index 2be593d..9596c0b 100644 (file)
--- a/gst/alpha/gstalpha.c
+++ b/gst/alpha/gstalpha.c
@@ -857,6 +857,7 @@ gst_alpha_chain (GstPad * pad, GstBuffer * buffer)
 static GstStateChangeReturn
 gst_alpha_change_state (GstElement * element, GstStateChange transition)
 {
+  GstStateChangeReturn res;
   GstAlpha *alpha;
 
   alpha = GST_ALPHA (element);
@@ -868,18 +869,21 @@ gst_alpha_change_state (GstElement * element, GstStateChange transition)
       gst_alpha_init_params (alpha);
       break;
     case GST_STATE_CHANGE_PAUSED_TO_PLAYING:
+    default:
       break;
+  }
+
+  res = parent_class->change_state (element, transition);
+
+  switch (transition) {
     case GST_STATE_CHANGE_PLAYING_TO_PAUSED:
-      break;
     case GST_STATE_CHANGE_PAUSED_TO_READY:
-      break;
     case GST_STATE_CHANGE_READY_TO_NULL:
+    default:
       break;
   }
 
-  parent_class->change_state (element, transition);
-
-  return GST_STATE_CHANGE_SUCCESS;
+  return res;
 }
 
 static gboolean