gst/base/gstbasesrc.c: Remove implicit cast from gboolean to GstElementStateReturn; make sure we still return failure...

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.
This commit is contained in:
Tim-Philipp Müller 2005-05-17 14:01:51 +00:00
parent f60dcb51d5
commit 7fa9d7eb65
3 changed files with 12 additions and 2 deletions

View file

@ -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):

View file

@ -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;

View file

@ -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;