Skip to content

Commit

Permalink
test: fix up HAVE_X11 / HAVE_X defines
Browse files Browse the repository at this point in the history
Only HAVE_X was defined, while both HAVE_X11 and HAVE_X were used.
  • Loading branch information
tp-m authored and GStreamer Merge Bot committed Dec 9, 2019
1 parent 006f8ce commit 3921a94
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion meson.build
Expand Up @@ -278,7 +278,7 @@ else
gtk_quartz_dep = dependency('', required : false)
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())

if gio_dep.type_name() == 'pkgconfig'
Expand Down
10 changes: 5 additions & 5 deletions tests/examples/seek/jsseek.c
Expand Up @@ -42,7 +42,7 @@
#include <linux/input.h>
#include <linux/joystick.h>

#ifdef HAVE_X
#ifdef HAVE_X11
#include <gdk/gdkx.h>
#endif
#include <gst/video/videooverlay.h>
Expand Down Expand Up @@ -2416,7 +2416,7 @@ msg_clock_lost (GstBus * bus, GstMessage * message, GstPipeline * data)
gst_element_set_state (pipeline, GST_STATE_PLAYING);
}

#ifdef HAVE_X
#ifdef HAVE_X11

static gulong embed_xid = 0;

Expand Down Expand Up @@ -2475,7 +2475,7 @@ realize_cb (GtkWidget * widget, gpointer data)
if (!gdk_window_ensure_native (window))
g_error ("Couldn't create native window needed for GstVideoOverlay!");

#ifdef HAVE_X
#ifdef HAVE_X11
embed_xid = GDK_WINDOW_XID (window);
g_print ("Window realize: video window XID = %lu\n", embed_xid);
#endif
Expand Down Expand Up @@ -2509,7 +2509,7 @@ connect_bus_signals (GstElement * pipeline)
{
GstBus *bus = gst_pipeline_get_bus (GST_PIPELINE (pipeline));

#ifdef HAVE_X
#ifdef HAVE_X11
/* handle prepare-window-handle element message synchronously */
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler,
pipeline, NULL);
Expand Down Expand Up @@ -2998,7 +2998,7 @@ main (int argc, char **argv)
* asks for the XID of the window to render onto */
gtk_widget_realize (window);

#ifdef HAVE_X
#ifdef HAVE_X11
/* we should have the XID now */
g_assert (embed_xid != 0);
#endif
Expand Down

0 comments on commit 3921a94

Please sign in to comment.