mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-29 21:21:12 +00:00
Code Issues 1 Projects Releases Wiki Activity

test: fix up HAVE_X11 / HAVE_X defines

Browse source 
Only HAVE_X was defined, while both HAVE_X11 and HAVE_X were used.
This commit is contained in:
Tim-Philipp Müller 2019-12-08 00:50:03 +00:00 committed by GStreamer Merge Bot
parent 006f8cea96
commit 3921a94f28
2 changed files with 6 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
meson.build
View file

@ -278,7 +278,7 @@ else
gtk_quartz_dep = dependency('', required : false) gtk_quartz_dep = dependency('', required : false)
endif endif
core_conf.set('HAVE_X', x11_dep.found()) core_conf.set('HAVE_X11', x11_dep.found())
core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found()) core_conf.set('HAVE_GIO_UNIX_2_0', giounix_dep.found())
if gio_dep.type_name() == 'pkgconfig' if gio_dep.type_name() == 'pkgconfig'

10
tests/examples/seek/jsseek.c
View file

@ -42,7 +42,7 @@
#include <linux/input.h> #include <linux/input.h>
#include <linux/joystick.h> #include <linux/joystick.h>
#ifdef HAVE_X #ifdef HAVE_X11
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif #endif
#include <gst/video/videooverlay.h> #include <gst/video/videooverlay.h>
@ -2416,7 +2416,7 @@ msg_clock_lost (GstBus * bus, GstMessage * message, GstPipeline * data)
gst_element_set_state (pipeline, GST_STATE_PLAYING); gst_element_set_state (pipeline, GST_STATE_PLAYING);
} }
#ifdef HAVE_X #ifdef HAVE_X11
static gulong embed_xid = 0; static gulong embed_xid = 0;
@ -2475,7 +2475,7 @@ realize_cb (GtkWidget * widget, gpointer data)
if (!gdk_window_ensure_native (window)) if (!gdk_window_ensure_native (window))
g_error ("Couldn't create native window needed for GstVideoOverlay!"); g_error ("Couldn't create native window needed for GstVideoOverlay!");
#ifdef HAVE_X #ifdef HAVE_X11
embed_xid = GDK_WINDOW_XID (window); embed_xid = GDK_WINDOW_XID (window);
g_print ("Window realize: video window XID = %lu\n", embed_xid); g_print ("Window realize: video window XID = %lu\n", embed_xid);
#endif #endif
@ -2509,7 +2509,7 @@ connect_bus_signals (GstElement * pipeline)
{ {
GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline)); GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));
#ifdef HAVE_X #ifdef HAVE_X11
/* handle prepare-window-handle element message synchronously */ /* handle prepare-window-handle element message synchronously */
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler, gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler,
pipeline, NULL); pipeline, NULL);
@ -2998,7 +2998,7 @@ main (int argc, char **argv)
* asks for the XID of the window to render onto */ * asks for the XID of the window to render onto */
gtk_widget_realize (window); gtk_widget_realize (window);
#ifdef HAVE_X #ifdef HAVE_X11
/* we should have the XID now */ /* we should have the XID now */
g_assert (embed_xid != 0); g_assert (embed_xid != 0);
#endif #endif