From: <co...@fr...> - 2005-05-01 16:20:59
|
CVS Root: /cvs/gstreamer Module: gstreamer Changes by: company Date: Mon May 02 2005 02:20:54 EST Branch: BRANCH-GSTREAMER-0_8 Log message: * gst/elements/gstfakesink.c: (gst_fakesink_change_state): don't error when we are in error already the correct fix would be to not allow erroring in downwards state changes, but I guess the API police would hunt me down if I did that Modified files: . : ChangeLog gst/elements : gstfakesink.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/ChangeLog.diff?r1=1.966.2.57&r2=1.966.2.58 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gstreamer/gst/elements/gstfakesink.c.diff?r1=1.70&r2=1.70.4.1 ====Begin Diffs==== Index: gstfakesink.c =================================================================== RCS file: /cvs/gstreamer/gstreamer/gst/elements/gstfakesink.c,v retrieving revision 1.70 retrieving revision 1.70.4.1 diff -u -d -r1.70 -r1.70.4.1 --- gstfakesink.c 8 Nov 2004 15:45:31 -0000 1.70 +++ gstfakesink.c 1 May 2005 16:20:42 -0000 1.70.4.1 @@ -396,7 +396,8 @@ goto error; break; case GST_STATE_PLAYING_TO_PAUSED: - if (fakesink->state_error == FAKESINK_STATE_ERROR_PLAYING_PAUSED) + if (!GST_FLAG_IS_SET (fakesink, GST_ELEMENT_IN_ERROR) && + fakesink->state_error == FAKESINK_STATE_ERROR_PLAYING_PAUSED) case GST_STATE_PAUSED_TO_READY: Index: ChangeLog RCS file: /cvs/gstreamer/gstreamer/ChangeLog,v retrieving revision 1.966.2.57 retrieving revision 1.966.2.58 diff -u -d -r1.966.2.57 -r1.966.2.58 --- ChangeLog 26 Apr 2005 18:11:21 -0000 1.966.2.57 +++ ChangeLog 1 May 2005 16:20:41 -0000 1.966.2.58 @@ -1,3 +1,11 @@ +2005-05-01 Benjamin Otte <in...@pu...> + + * gst/elements/gstfakesink.c: (gst_fakesink_change_state): + don't error when we are in error already + the correct fix would be to not allow erroring in downwards + state changes, but I guess the API police would hunt me down if I + did that 2005-04-26 Wim Taymans <wi...@fl...> * gst/gsttrashstack.h: |