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

seek: use the right GDK defines to differentiate between the backends

Browse source
This commit is contained in:
Tim-Philipp Müller 2011-05-25 18:50:34 +01:00
parent 2ff8c8777f
commit ee6fbc2874
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
tests/examples/seek/seek.c
View file

@ -32,10 +32,10 @@
#include <gst/gst.h> #include <gst/gst.h>
#include <string.h> #include <string.h>
#ifdef HAVE_X #include <gdk/gdk.h>
#if defined (GDK_WINDOWING_X11)
#include <gdk/gdkx.h> #include <gdk/gdkx.h>
#endif #elif defined (GDK_WINDOWING_WIN32)
#ifdef G_OS_WIN32
#include <gdk/gdkwin32.h> #include <gdk/gdkwin32.h>
#endif #endif
@ -2439,7 +2439,7 @@ msg_clock_lost (GstBus * bus, GstMessage * message, GstPipeline * data)
} }
} }
#if defined (HAVE_X) || defined (G_OS_WIN32) #if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WIN32)
static gulong embed_xid = 0; static gulong embed_xid = 0;
@ -2507,11 +2507,11 @@ realize_cb (GtkWidget * widget, gpointer data)
} }
#endif #endif
#if defined (HAVE_X) || defined (G_OS_WIN32) #if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WIN32)
{ {
GdkWindow *window = gtk_widget_get_window (video_window); GdkWindow *window = gtk_widget_get_window (video_window);
#ifdef G_OS_WIN32 #if defined (GDK_WINDOWING_WIN32)
embed_xid = GDK_WINDOW_HWND (window); embed_xid = GDK_WINDOW_HWND (window);
#else #else
embed_xid = GDK_WINDOW_XID (window); embed_xid = GDK_WINDOW_XID (window);
@ -2549,7 +2549,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 #if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WIN32)
/* handle prepare-xwindow-id element message synchronously */ /* handle prepare-xwindow-id element message synchronously */
gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler, gst_bus_set_sync_handler (bus, (GstBusSyncHandler) bus_sync_handler,
pipeline); pipeline);
@ -2989,7 +2989,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 #if defined (GDK_WINDOWING_X11) || defined (GDK_WINDOWING_WIN32)
/* we should have the XID now */ /* we should have the XID now */
g_assert (embed_xid != 0); g_assert (embed_xid != 0);
#endif #endif