mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-24 02:31:03 +00:00
Code Issues 1 Projects Releases Wiki Activity

[568/906] window: fix public definitions

Browse source
This commit is contained in:
Matthew 2012-08-27 14:08:16 +00:00 committed by Matthew Waters
parent 20406c1de3
commit ed1f04acab
3 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
gst-libs/gst/gl/gstglwindow_cocoa.m
View file

@ -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;

8
gst-libs/gst/gl/gstglwindow_winCE.c
View file

@ -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;

10
gst-libs/gst/gl/gstglwindow_x11ES2.c
View file

@ -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);