Original commit message from CVS:
* 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 Jan Schmidt <thaytan@mad.scientist.com>
+ * 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 <ensonic@users.sf.net>
* configure.ac:
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")
AC_SUBST(X_LIBS)
fi
AC_SUBST(HAVE_X)
+ CFLAGS="$ac_cflags_save"
+ CPPFLAGS="$ac_cppflags_save"
])
dnl *** XVideo ***
break;
case GST_STATE_PAUSED_TO_PLAYING:
break;
- default:
- break;
- }
-
- ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
-
- switch (transition) {
- case GST_STATE_PLAYING_TO_PAUSED:
- break;
case GST_STATE_PAUSED_TO_READY:
gst_collectpads_stop (adder->collect);
break;
- case GST_STATE_READY_TO_NULL:
- break;
default:
break;
}
+
+ ret = GST_ELEMENT_CLASS (parent_class)->change_state (element);
+
return ret;
}