gst/base/gstbasesrc.c: Remove implicit cast from gboolean to GstElementStateReturn...

Original commit message from CVS:
* gst/base/gstbasesrc.c: (gst_basesrc_change_state):
Remove implicit cast from gboolean to GstElementStateReturn;
make sure we still return failure in paused => ready case if
the parent class fails to change state and our own stop
vfunc succeeds.

diff --git a/ChangeLog b/ChangeLog
index 73a6b85..e2883ee 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+2005-05-17  Tim-Philipp Müller  <tim at centricular dot net>
+
+       * gst/base/gstbasesrc.c: (gst_basesrc_change_state):
+         Remove implicit cast from gboolean to GstElementStateReturn;
+         make sure we still return failure in paused => ready case if
+         the parent class fails to change state and our own stop 
+         vfunc succeeds.
+
 2005-05-17  Wim Taymans  <wim@fluendo.com>
 
        * tools/gst-launch.c: (event_loop):

diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c
index 80354fd..43ddf5a 100644 (file)
--- a/gst/base/gstbasesrc.c
+++ b/gst/base/gstbasesrc.c
@@ -803,7 +803,8 @@ gst_basesrc_change_state (GstElement * element)
     case GST_STATE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_PAUSED_TO_READY:
-      result = gst_basesrc_stop (basesrc);
+      if (!gst_basesrc_stop (basesrc))
+        result = GST_STATE_FAILURE;
       break;
     case GST_STATE_READY_TO_NULL:
       break;

diff --git a/libs/gst/base/gstbasesrc.c b/libs/gst/base/gstbasesrc.c
index 80354fd..43ddf5a 100644 (file)
--- a/libs/gst/base/gstbasesrc.c
+++ b/libs/gst/base/gstbasesrc.c
@@ -803,7 +803,8 @@ gst_basesrc_change_state (GstElement * element)
     case GST_STATE_PLAYING_TO_PAUSED:
       break;
     case GST_STATE_PAUSED_TO_READY:
-      result = gst_basesrc_stop (basesrc);
+      if (!gst_basesrc_stop (basesrc))
+        result = GST_STATE_FAILURE;
       break;
     case GST_STATE_READY_TO_NULL:
       break;