From ac138f74a164b2cac5b54b4b744cdadc7f054830 Mon Sep 17 00:00:00 2001
From: Stefan Kost <ensonic@users.sf.net>
Date: Thu, 16 Sep 2010 15:00:29 +0300
Subject: [PATCH] [461/906] xoverlay: require base from git and update to new
 API

---
 gst/gl/gstglimagesink.c                  |  9 +++++----
 tests/examples/clutter/clutteractor.c    |  2 +-
 tests/examples/clutter/clutteractortee.c |  2 +-
 tests/examples/gtk/gstgtk.c              | 14 +++++++-------
 4 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c
index 25d16d9aaa..915e43c16b 100644
--- a/gst/gl/gstglimagesink.c
+++ b/gst/gl/gstglimagesink.c
@@ -110,8 +110,8 @@ static GstFlowReturn gst_glimage_sink_render (GstBaseSink * bsink,
     GstBuffer * buf);
 
 static void gst_glimage_sink_xoverlay_init (GstXOverlayClass * iface);
-static void gst_glimage_sink_set_xwindow_id (GstXOverlay * overlay,
-    gulong window_id);
+static void gst_glimage_sink_set_window_handle (GstXOverlay * overlay,
+    guintptr id);
 static void gst_glimage_sink_expose (GstXOverlay * overlay);
 static gboolean gst_glimage_sink_interface_supported (GstImplementsInterface *
     iface, GType type);
@@ -643,15 +643,16 @@ gst_glimage_sink_render (GstBaseSink * bsink, GstBuffer * buf)
 static void
 gst_glimage_sink_xoverlay_init (GstXOverlayClass * iface)
 {
-  iface->set_xwindow_id = gst_glimage_sink_set_xwindow_id;
+  iface->set_window_handle = gst_glimage_sink_set_window_handle;
   iface->expose = gst_glimage_sink_expose;
 }
 
 
 static void
-gst_glimage_sink_set_xwindow_id (GstXOverlay * overlay, gulong window_id)
+gst_glimage_sink_set_window_handle (GstXOverlay * overlay, guintptr id)
 {
   GstGLImageSink *glimage_sink = GST_GLIMAGE_SINK (overlay);
+  gulong window_id = (gulong) id;
 
   g_return_if_fail (GST_IS_GLIMAGE_SINK (overlay));
 
diff --git a/tests/examples/clutter/clutteractor.c b/tests/examples/clutter/clutteractor.c
index 139cea00e8..77ed03f07a 100644
--- a/tests/examples/clutter/clutteractor.c
+++ b/tests/examples/clutter/clutteractor.c
@@ -106,7 +106,7 @@ create_window (GstBus * bus, GstMessage * message, gpointer data)
 
   g_debug ("CREATING WINDOW");
 
-  gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
+  gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
       actor->win);
   clutter_threads_add_idle ((GSourceFunc) create_actor, actor);
 
diff --git a/tests/examples/clutter/clutteractortee.c b/tests/examples/clutter/clutteractortee.c
index af8d24a3c8..63c8960af8 100644
--- a/tests/examples/clutter/clutteractortee.c
+++ b/tests/examples/clutter/clutteractortee.c
@@ -86,7 +86,7 @@ create_window (GstBus * bus, GstMessage * message, gpointer data)
 
   if (count < N_ACTORS) {
     g_message ("adding actor %d", count);
-    gst_x_overlay_set_xwindow_id (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
+    gst_x_overlay_set_window_handle (GST_X_OVERLAY (GST_MESSAGE_SRC (message)),
         actor[count]->win);
     clutter_threads_add_idle ((GSourceFunc) create_actor, actor[count]);
     count++;
diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c
index 3a68e19635..7ee2461b2f 100644
--- a/tests/examples/gtk/gstgtk.c
+++ b/tests/examples/gtk/gstgtk.c
@@ -32,20 +32,20 @@
 
 
 void
-gst_x_overlay_set_gtk_window (GstXOverlay *xoverlay, GtkWidget *window)
+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));
+  gst_x_overlay_set_window_handle (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));
+  gst_x_overlay_set_window_handle (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));
+  gst_x_overlay_set_window_handle (xoverlay,
+      GDK_WINDOW_XWINDOW (window->window));
 #else
 #error unimplemented GTK backend
 #endif
 
 }
-
-