hugok
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

emotion: work with older version of gstreamer. 

SVN revision: 64058
This commit is contained in:
Cedric BAIL 2011-10-14 04:01:43 +00:00
parent 2d4cd8058a
commit 534acda075
2 changed files with 22 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
legacy/emotion/configure.ac
View File

@ -256,23 +256,28 @@ fi
## Check if gstreamer X Overlay is available
build_xoverlay="no"
if test "x$enable_gstreamer" = "xyes"; then
save_CFLAGS=$CFLAGS
CFLAGS="$CFLAGS ${GSTREAMER_CFLAGS}"
AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
[
AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])
build_xoverlay="yes"
], [
build_xoverlay="no"
]
)
CFLAGS=$save_CFLAGS
if test "x${build_xoverlay}" = "xyes"; then
PKG_CHECK_MODULES([GSTREAMER_INTERFACE],
PKG_CHECK_MODULES([GSTREAMER_INTERFACE],
[ gstreamer-interfaces-0.10 >= 0.10.34 ],
[ build_xoverlay="yes" ],
[ build_xoverlay="no" ]
)
if test "x${build_xoverlay}" = "xyes"; then
save_CPPFLAGS=$CPPFLAGS
CPPFLAGS="$CPPFLAGS ${GSTREAMER_CFLAGS} ${GSTREAMER_INTERFACE_CFLAGS}"
AC_CHECK_HEADER([gst/interfaces/xoverlay.h],
[
AC_DEFINE(HAVE_XOVERLAY_H, 1, [Build with Gstreamer Xoverlay support])
build_xoverlay="yes"
], [
build_xoverlay="no"
]
)
CPPFLAGS=$save_CPPFLAGS
save_LDFLAGS=$LDFLAGS
LDFLAGS="$LDFLAGS ${GSTREAMER_INTERFACES}"
AC_CHECK_LIB(gstinterfaces-0.10, gst_x_overlay_set_window_handle, AC_DEFINE(HAVE_X_OVERLAY_SET, 1, [Use gst_x_overlay_set_window_handle instead of old deprecated gst_x_overlay_set_xwindow_id]))
LDFLAGS=$sava_LDFLAGS
fi
fi

4
legacy/emotion/src/modules/gstreamer/emotion_sink.c
View File

@ -1214,7 +1214,11 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
{
unsigned int pos[2];
#ifdef HAVE_X_OVERLAY_SET
gst_x_overlay_set_window_handle(GST_X_OVERLAY(xvsink), win);
#else
gst_x_overlay_set_xwindow_id(GST_X_OVERLAY(xvsink), win);
#endif
ev->win = win;
ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIDEO_PARENT, &parent, 1);