From: <th...@fr...> - 2005-08-01 21:14:40
|
CVS Root: /cvs/gstreamer Module: gst-plugins-base Changes by: thaytan Date: Mon Aug 01 2005 14:14:34 PDT Log message: * configure.ac: When testing for X libs, use the X CFlags * gst/adder/gstadder.c: (gst_adder_change_state): Stop the collectpads before calling parent state change function on PAUSED->READY, otherwise we deadlock deactivating pads. Modified files: . : ChangeLog configure.ac gst/adder : gstadder.c Links: http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/ChangeLog.diff?r1=1.1815&r2=1.1816 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/configure.ac.diff?r1=1.559&r2=1.560 http://freedesktop.org/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins-base/gst/adder/gstadder.c.diff?r1=1.60&r2=1.61 ====Begin Diffs==== Index: ChangeLog =================================================================== RCS file: /cvs/gstreamer/gst-plugins-base/ChangeLog,v retrieving revision 1.1815 retrieving revision 1.1816 diff -u -d -r1.1815 -r1.1816 --- ChangeLog 1 Aug 2005 16:20:33 -0000 1.1815 +++ ChangeLog 1 Aug 2005 21:14:22 -0000 1.1816 @@ -1,3 +1,10 @@ +2005-08-01 Jan Schmidt <th...@ma...> + * configure.ac: + When testing for X libs, use the X CFlags + * gst/adder/gstadder.c: (gst_adder_change_state): + Stop the collectpads before calling parent state change function + on PAUSED->READY, otherwise we deadlock deactivating pads. + 2005-08-01 Stefan Kost <en...@us...> * configure.ac: Index: configure.ac RCS file: /cvs/gstreamer/gst-plugins-base/configure.ac,v retrieving revision 1.559 retrieving revision 1.560 diff -u -d -r1.559 -r1.560 --- configure.ac 1 Aug 2005 16:20:33 -0000 1.559 +++ configure.ac 1 Aug 2005 21:14:22 -0000 1.560 @@ -415,6 +415,11 @@ GST_CHECK_FEATURE(X, [X libraries and plugins], [ximagesink], [ AC_PATH_XTRA + ac_cflags_save="$CFLAGS" + ac_cppflags_save="$CPPFLAGS" + CFLAGS="$CFLAGS $X_CFLAGS" + CPPFLAGS="$CPPFLAGS $X_CFLAGS" dnl now try to find the HEADER AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no") @@ -431,6 +436,8 @@ AC_SUBST(X_LIBS) fi AC_SUBST(HAVE_X) + CFLAGS="$ac_cflags_save" + CPPFLAGS="$ac_cppflags_save" ]) dnl *** XVideo *** Index: gstadder.c RCS file: /cvs/gstreamer/gst-plugins-base/gst/adder/gstadder.c,v retrieving revision 1.60 retrieving revision 1.61 diff -u -d -r1.60 -r1.61 --- gstadder.c 28 Jun 2005 10:16:12 -0000 1.60 +++ gstadder.c 1 Aug 2005 21:14:22 -0000 1.61 @@ -419,23 +419,15 @@ break; case GST_STATE_PAUSED_TO_PLAYING: - default: - break; - } - - ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); - switch (transition) { - case GST_STATE_PLAYING_TO_PAUSED: case GST_STATE_PAUSED_TO_READY: gst_collectpads_stop (adder->collect); - case GST_STATE_READY_TO_NULL: default: } + ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); return ret; } |