mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-02-17 11:45:25 +00:00
Code Issues 1 Projects Releases Wiki Activity

configure.ac: When testing for X libs, use the X CFlags

Browse source 
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.
This commit is contained in:
Jan Schmidt 2005-08-01 21:14:22 +00:00
parent 497b586076
commit b34c0e7e53
3 changed files with 17 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
ChangeLog
View file

@ -1,3 +1,10 @@
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> 2005-08-01 Stefan Kost <ensonic@users.sf.net>
* configure.ac: * configure.ac:

7
configure.ac
View file

@ -415,6 +415,11 @@ translit(dnm, m, l) AM_CONDITIONAL(USE_X, true)
GST_CHECK_FEATURE(X, [X libraries and plugins], GST_CHECK_FEATURE(X, [X libraries and plugins],
[ximagesink], [ [ximagesink], [
AC_PATH_XTRA 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 dnl now try to find the HEADER
AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no") AC_CHECK_HEADER(X11/Xlib.h, HAVE_X="yes", HAVE_X="no")
@ -431,6 +436,8 @@ GST_CHECK_FEATURE(X, [X libraries and plugins],
AC_SUBST(X_LIBS) AC_SUBST(X_LIBS)
fi fi
AC_SUBST(HAVE_X) AC_SUBST(HAVE_X)
CFLAGS="$ac_cflags_save"
CPPFLAGS="$ac_cppflags_save"
]) ])
dnl *** XVideo *** dnl *** XVideo ***

14
gst/adder/gstadder.c
View file

@ -419,23 +419,15 @@ gst_adder_change_state (GstElement * element)
break; break;
case GST_STATE_PAUSED_TO_PLAYING: case GST_STATE_PAUSED_TO_PLAYING:
break; break;
case GST_STATE_PAUSED_TO_READY:
gst_collectpads_stop (adder->collect);
break;
default: default:
break; break;
} }
ret = GST_ELEMENT_CLASS (parent_class)->change_state (element); 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;
}
return ret; return ret;
} }