forked from enlightenment/efl
emotion: work with older version of gstreamer.
SVN revision: 64058
This commit is contained in:
parent
2d4cd8058a
commit
534acda075
|
@ -256,23 +256,28 @@ fi
|
||||||
## Check if gstreamer X Overlay is available
|
## Check if gstreamer X Overlay is available
|
||||||
build_xoverlay="no"
|
build_xoverlay="no"
|
||||||
if test "x$enable_gstreamer" = "xyes"; then
|
if test "x$enable_gstreamer" = "xyes"; then
|
||||||
save_CFLAGS=$CFLAGS
|
PKG_CHECK_MODULES([GSTREAMER_INTERFACE],
|
||||||
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],
|
|
||||||
[ gstreamer-interfaces-0.10 >= 0.10.34 ],
|
[ gstreamer-interfaces-0.10 >= 0.10.34 ],
|
||||||
[ build_xoverlay="yes" ],
|
[ build_xoverlay="yes" ],
|
||||||
[ build_xoverlay="no" ]
|
[ 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
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -1214,7 +1214,11 @@ gstreamer_video_sink_new(Emotion_Gstreamer_Video *ev,
|
||||||
{
|
{
|
||||||
unsigned int pos[2];
|
unsigned int pos[2];
|
||||||
|
|
||||||
|
#ifdef HAVE_X_OVERLAY_SET
|
||||||
gst_x_overlay_set_window_handle(GST_X_OVERLAY(xvsink), win);
|
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;
|
ev->win = win;
|
||||||
|
|
||||||
ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIDEO_PARENT, &parent, 1);
|
ecore_x_window_prop_card32_set(win, ECORE_X_ATOM_E_VIDEO_PARENT, &parent, 1);
|
||||||
|
|
Loading…
Reference in New Issue