[328/906] Convert gtk examples to use helper library

Helper lib implements gst-gtk glue on all platforms

diff --git a/tests/examples/gtk/fxtest/fxtest.c b/tests/examples/gtk/fxtest/fxtest.c
index a02272fa593278f3ac896c998089a8589155dd7f..7242c9ba4b90f596b240a7c59616e5b209172517 100644 (file)
--- a/tests/examples/gtk/fxtest/fxtest.c
+++ b/tests/examples/gtk/fxtest/fxtest.c
@@ -3,11 +3,7 @@
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef WIN32
-#include <gdk/gdkwin32.h>
-#else
-#include <gdk/gdkx.h>
-#endif
+#include "../gstgtk.h"
 
 #include <gst/interfaces/xoverlay.h>
 
@@ -19,12 +15,8 @@ expose_cb (GtkWidget * widget, GdkEventExpose * event, gpointer data)
   GstXOverlay *overlay =
       GST_X_OVERLAY (gst_bin_get_by_interface (GST_BIN (data),
           GST_TYPE_X_OVERLAY));
-#ifdef WIN32
-  gst_x_overlay_set_xwindow_id (overlay,
-      (gulong) GDK_WINDOW_HWND (widget->window));
-#else
-  gst_x_overlay_set_xwindow_id (overlay, GDK_WINDOW_XWINDOW (widget->window));
-#endif
+
+  gst_x_overlay_set_gtk_window (overlay, widget);
 
   return FALSE;
 }

diff --git a/tests/examples/gtk/fxtest/pixbufdrop.c b/tests/examples/gtk/fxtest/pixbufdrop.c
index 4dba23c36ee3efc877530db5f6dd775e28e3f057..9ebe166c45f09a4392fc59b0a44421e6ebd9e4b9 100644 (file)
--- a/tests/examples/gtk/fxtest/pixbufdrop.c
+++ b/tests/examples/gtk/fxtest/pixbufdrop.c
@@ -3,11 +3,7 @@
 #include <gdk/gdk.h>
 #include <gdk-pixbuf/gdk-pixbuf.h>
 
-#ifdef WIN32
-#include <gdk/gdkwin32.h>
-#else
-#include <gdk/gdkx.h>
-#endif
+#include "../gstgtk.h"
 
 #include <gst/interfaces/xoverlay.h>
 
@@ -33,13 +29,7 @@ create_window (GstBus * bus, GstMessage * message, GtkWidget * widget)
   if (!gst_structure_has_name (message->structure, "prepare-xwindow-id"))
     return GST_BUS_PASS;
 
-#ifdef WIN32
-  gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
-      (gulong) GDK_WINDOW_HWND (widget->window));
-#else
-  gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
-      GDK_WINDOW_XWINDOW (widget->window));
-#endif
+  gst_x_overlay_set_gtk_window (GST_X_OVERLAY (GST_MESSAGE_SRC (message)), widget);
 
   gst_message_unref (message);
 

diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c
new file mode 100644 (file)
index 0000000..3685c87
--- /dev/null
+++ b/tests/examples/gtk/gstgtk.c
@@ -0,0 +1,32 @@
+
+#include "gstgtk.h"
+
+#if defined(GDK_WINDOWING_WIN32)
+#include <gdk/gdkwin32.h>
+#elif defined(GDK_WINDOWING_X11)
+#include <gdk/gdkx.h>
+#elif defined(GDK_WINDOWING_QUARTZ)
+#include <gdk/gdkquartz.h>
+#else
+#error unimplemented GTK backend
+#endif
+
+
+void
+gst_x_overlay_set_gtk_window (GstXOverlay *xoverlay, GtkWidget *window)
+{
+
+#if defined(GDK_WINDOWING_WIN32)
+    gst_x_overlay_set_xwindow_id (xoverlay, (gulong)GDK_WINDOW_HWND(window->window));
+#elif defined(GDK_WINDOWING_QUARTZ)
+    gst_x_overlay_set_xwindow_id (xoverlay,
+        (gulong)gdk_quartz_window_get_nswindow (window->window));
+#elif defined(GDK_WINDOWING_X11)
+    gst_x_overlay_set_xwindow_id (xoverlay, GDK_WINDOW_XWINDOW(window->window));
+#else
+#error unimplemented GTK backend
+#endif
+
+}
+
+