From: Matthew <matt@matt-bunt-lapt.(none)>
Date: Mon, 27 Aug 2012 14:08:16 +0000 (+0000)
Subject: [568/906] window: fix public definitions
X-Git-Tag: 1.19.3~511^2~1989^2~1932
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2dff52334c366b498ea9e169abc5902996789757;p=platform%2Fupstream%2Fgstreamer.git

[568/906] window: fix public definitions
---

diff --git a/gst-libs/gst/gl/gstglwindow_cocoa.m b/gst-libs/gst/gl/gstglwindow_cocoa.m
index 9c6adad..b8618e5 100755
--- a/gst-libs/gst/gl/gstglwindow_cocoa.m
+++ b/gst-libs/gst/gl/gstglwindow_cocoa.m
@@ -204,7 +204,7 @@ gst_gl_window_init (GstGLWindow * window)
 
 /* Must be called in the gl thread */
 GstGLWindow *
-gst_gl_window_new (gulong external_gl_context)
+gst_gl_window_new (guintptr external_gl_context)
 {
   GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL);
   GstGLWindowPrivate *priv = window->priv;
@@ -265,11 +265,11 @@ gst_gl_window_error_quark (void)
   return g_quark_from_static_string ("gst-gl-window-error");
 }
 
-gulong
+guintptr
 gst_gl_window_get_internal_gl_context (GstGLWindow * window)
 {
   GstGLWindowPrivate *priv = window->priv;
-  return (gulong) priv->gl_context;
+  return (guintptr) priv->gl_context;
 }
 
 void
@@ -297,7 +297,7 @@ gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate)
 }
 
 void
-gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id)
+gst_gl_window_set_external_window_id (GstGLWindow * window, guintptr id)
 {
   GstGLWindowPrivate *priv = window->priv;
   
diff --git a/gst-libs/gst/gl/gstglwindow_winCE.c b/gst-libs/gst/gl/gstglwindow_winCE.c
index ecd72e6..2fc01fd 100644
--- a/gst-libs/gst/gl/gstglwindow_winCE.c
+++ b/gst-libs/gst/gl/gstglwindow_winCE.c
@@ -146,7 +146,7 @@ gst_gl_window_init (GstGLWindow * window)
 
 /* Must be called in the gl thread */
 GstGLWindow *
-gst_gl_window_new (gulong external_gl_context)
+gst_gl_window_new (guintptr external_gl_context)
 {
   GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL);
   GstGLWindowPrivate *priv = window->priv;
@@ -205,11 +205,11 @@ gst_gl_window_error_quark (void)
   return g_quark_from_static_string ("gst-gl-window-error");
 }
 
-gulong
+guintptr
 gst_gl_window_get_internal_gl_context (GstGLWindow * window)
 {
   GstGLWindowPrivate *priv = window->priv;
-  return (gulong) priv->gl_context;
+  return (guintptr) priv->gl_context;
 }
 
 void
@@ -239,7 +239,7 @@ gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate)
 }
 
 void
-gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id)
+gst_gl_window_set_external_window_id (GstGLWindow * window, guintptr id)
 {
   GstGLWindowPrivate *priv = window->priv;
 
diff --git a/gst-libs/gst/gl/gstglwindow_x11ES2.c b/gst-libs/gst/gl/gstglwindow_x11ES2.c
index 5f9bcb7..0210d8e 100644
--- a/gst-libs/gst/gl/gstglwindow_x11ES2.c
+++ b/gst-libs/gst/gl/gstglwindow_x11ES2.c
@@ -297,7 +297,7 @@ gst_gl_window_init (GstGLWindow * window)
 
 /* Must be called in the gl thread */
 GstGLWindow *
-gst_gl_window_new (gulong external_gl_context)
+gst_gl_window_new (guintptr external_gl_context)
 {
   GstGLWindow *window = g_object_new (GST_GL_TYPE_WINDOW, NULL);
   GstGLWindowPrivate *priv = window->priv;
@@ -493,11 +493,11 @@ gst_gl_window_error_quark (void)
   return g_quark_from_static_string ("gst-gl-window-error");
 }
 
-gulong
+guintptr
 gst_gl_window_get_internal_gl_context (GstGLWindow * window)
 {
   GstGLWindowPrivate *priv = window->priv;
-  return (gulong) priv->gl_context;
+  return (guintptr) priv->gl_context;
 }
 
 void
@@ -532,7 +532,7 @@ gst_gl_window_activate_gl_context (GstGLWindow * window, gboolean activate)
 
 /* Not called by the gl thread */
 void
-gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id)
+gst_gl_window_set_external_window_id (GstGLWindow * window, guintptr id)
 {
   if (window) {
     GstGLWindowPrivate *priv = window->priv;
@@ -542,7 +542,7 @@ gst_gl_window_set_external_window_id (GstGLWindow * window, gulong id)
 
     priv->parent = (Window) id;
 
-    g_debug ("set parent window id: %lud\n", id);
+    g_debug ("set parent window id: %lud\n", (gulong) id);
 
     XGetWindowAttributes (priv->disp_send, priv->parent, &attr);