From 8efcecb98cf66d5b4a282facef0ea1ae966fff2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Sebastian=20Dr=C3=B6ge?= Date: Wed, 17 Jul 2013 11:22:02 +0200 Subject: [PATCH] [771/906] gl: Some less long/ulong/gulong usage --- gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m | 4 ++-- gst-libs/gst/gl/gstglfilter.c | 2 +- gst-libs/gst/gl/gstglfilter.h | 2 +- gst-libs/gst/gl/win32/gstglwindow_win32_egl.c | 4 ++-- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index a6e993780f..c8b45d8b98 100644 --- a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m +++ b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m @@ -246,7 +246,7 @@ gst_gl_window_cocoa_create_context (GstGLWindow *window, GstGLAPI gl_api, NSResizableWindowMask | NSMiniaturizableWindowMask) backing: NSBackingStoreBuffered defer: NO screen: nil gstWin: window_cocoa]; - GST_DEBUG ("NSWindow id: %lud\n", (gulong) priv->internal_win_id); + GST_DEBUG ("NSWindow id: %lud\n", (guintptr) priv->internal_win_id); priv->thread = [NSThread currentThread]; @@ -518,7 +518,7 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window) glContext = [[NSOpenGLContext alloc] initWithFormat:fmt shareContext:m_cocoa->priv->external_gl_context]; - GST_DEBUG ("NSOpenGL context created: %lud\n", (gulong) glContext); + GST_DEBUG ("NSOpenGL context created: %lud\n", (guintptr) glContext); m_cocoa->priv->gl_context = glContext; diff --git a/gst-libs/gst/gl/gstglfilter.c b/gst-libs/gst/gl/gstglfilter.c index 31cceab199..85b12de7f9 100644 --- a/gst-libs/gst/gl/gstglfilter.c +++ b/gst-libs/gst/gl/gstglfilter.c @@ -149,7 +149,7 @@ gst_gl_filter_set_property (GObject * object, guint prop_id, switch (prop_id) { case PROP_EXTERNAL_OPENGL_CONTEXT: { - filter->external_gl_context = g_value_get_ulong (value); + filter->external_gl_context = g_value_get_uint64 (value); break; } default: diff --git a/gst-libs/gst/gl/gstglfilter.h b/gst-libs/gst/gl/gstglfilter.h index 3b5c1337e6..61b011cfa1 100644 --- a/gst-libs/gst/gl/gstglfilter.h +++ b/gst-libs/gst/gl/gstglfilter.h @@ -80,7 +80,7 @@ struct _GstGLFilter GstGLShader *default_shader; - gulong external_gl_context; + guint64 external_gl_context; }; /** diff --git a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c index 8f046e8398..6229c51817 100644 --- a/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c +++ b/gst-libs/gst/gl/win32/gstglwindow_win32_egl.c @@ -190,11 +190,11 @@ gst_gl_window_win32_egl_create_context (GstGLWindowWin32 * window_win32, contextAttribs); if (window_egl->egl_context != EGL_NO_CONTEXT) GST_DEBUG ("gl context created: %lud, external: %lud", - (gulong) window_egl->egl_context, (gulong) external_gl_context); + (guintptr) window_egl->egl_context, (guintptr) external_gl_context); else { g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_CREATE_CONTEXT, "failed to create glcontext with external: %lud, %s", - (gulong) external_gl_context, WinEGLErrorString ()); + (guintptr) external_gl_context, WinEGLErrorString ()); goto failure; }