From 7fa9d7eb65c9bd99d30d6986b09922a09d633757 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Tim-Philipp=20M=C3=BCller?= Date: Tue, 17 May 2005 14:01:51 +0000 Subject: [PATCH] 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. --- ChangeLog | 8 ++++++++ gst/base/gstbasesrc.c | 3 ++- libs/gst/base/gstbasesrc.c | 3 ++- 3 files changed, 12 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 73a6b85..e2883ee 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2005-05-17 Tim-Philipp Müller + + * 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 * tools/gst-launch.c: (event_loop): diff --git a/gst/base/gstbasesrc.c b/gst/base/gstbasesrc.c index 80354fd..43ddf5a 100644 --- 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 --- 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; -- 2.7.4