mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-27 12:11:13 +00:00
Code Issues 1 Projects Releases Wiki Activity

[771/906] gl: Some less long/ulong/gulong usage

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-17 11:22:02 +02:00 committed by Matthew Waters
parent d0e95c34f3
commit 20cb4fb038
7 changed files with 11 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m
View file

@ -246,7 +246,7 @@ gst_gl_window_cocoa_create_context (GstGLWindow *window, GstGLAPI gl_api,
NSResizableWindowMask | NSMiniaturizableWindowMask) NSResizableWindowMask | NSMiniaturizableWindowMask)
backing: NSBackingStoreBuffered defer: NO screen: nil gstWin: window_cocoa]; 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]; priv->thread = [NSThread currentThread];
@ -518,7 +518,7 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window)
glContext = [[NSOpenGLContext alloc] initWithFormat:fmt glContext = [[NSOpenGLContext alloc] initWithFormat:fmt
shareContext:m_cocoa->priv->external_gl_context]; 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; m_cocoa->priv->gl_context = glContext;

2
gst-libs/gst/gl/gstglfilter.c
View file

@ -149,7 +149,7 @@ gst_gl_filter_set_property (GObject * object, guint prop_id,
switch (prop_id) { switch (prop_id) {
case PROP_EXTERNAL_OPENGL_CONTEXT: case PROP_EXTERNAL_OPENGL_CONTEXT:
{ {
filter->external_gl_context = g_value_get_ulong (value); filter->external_gl_context = g_value_get_uint64 (value);
break; break;
} }
default: default:

2
gst-libs/gst/gl/gstglfilter.h
View file

@ -80,7 +80,7 @@ struct _GstGLFilter
GstGLShader *default_shader; GstGLShader *default_shader;
gulong external_gl_context; guint64 external_gl_context;
}; };
/** /**

4
gst-libs/gst/gl/win32/gstglwindow_win32_egl.c
View file

@ -190,11 +190,11 @@ gst_gl_window_win32_egl_create_context (GstGLWindowWin32 * window_win32,
contextAttribs); contextAttribs);
if (window_egl->egl_context != EGL_NO_CONTEXT) if (window_egl->egl_context != EGL_NO_CONTEXT)
GST_DEBUG ("gl context created: %lud, external: %lud", 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 { else {
g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_CREATE_CONTEXT, g_set_error (error, GST_GL_WINDOW_ERROR, GST_GL_WINDOW_ERROR_CREATE_CONTEXT,
"failed to create glcontext with external: %lud, %s", "failed to create glcontext with external: %lud, %s",
(gulong) external_gl_context, WinEGLErrorString ()); (guintptr) external_gl_context, WinEGLErrorString ());
goto failure; goto failure;
} }

2
gst/gl/gstglimagesink.c
View file

@ -744,7 +744,7 @@ static void
gst_glimage_sink_set_window_handle (GstVideoOverlay * overlay, guintptr id) gst_glimage_sink_set_window_handle (GstVideoOverlay * overlay, guintptr id)
{ {
GstGLImageSink *glimage_sink = GST_GLIMAGE_SINK (overlay); GstGLImageSink *glimage_sink = GST_GLIMAGE_SINK (overlay);
gulong window_id = (gulong) id; guintptr window_id = (guintptr) id;
g_return_if_fail (GST_IS_GLIMAGE_SINK (overlay)); g_return_if_fail (GST_IS_GLIMAGE_SINK (overlay));

4
gst/gl/gstglimagesink.h
View file

@ -54,8 +54,8 @@ struct _GstGLImageSink
//properties //properties
gchar *display_name; gchar *display_name;
gulong window_id; guintptr window_id;
gulong new_window_id; guintptr new_window_id;
//caps //caps
GstVideoInfo info; GstVideoInfo info;

4
tests/examples/gtk/gstgtk.c
View file

@ -41,10 +41,10 @@ gst_video_overlay_set_gtk_window (GstVideoOverlay * videooverlay,
#if defined(GDK_WINDOWING_WIN32) #if defined(GDK_WINDOWING_WIN32)
gst_video_overlay_set_window_handle (videooverlay, gst_video_overlay_set_window_handle (videooverlay,
(gulong) GDK_WINDOW_HWND (window->window)); (guintptr) GDK_WINDOW_HWND (window->window));
#elif defined(GDK_WINDOWING_QUARTZ) #elif defined(GDK_WINDOWING_QUARTZ)
gst_video_overlay_set_window_handle (videooverlay, gst_video_overlay_set_window_handle (videooverlay,
(gulong) gdk_quartz_window_get_nswindow (window->window)); (guintptr) gdk_quartz_window_get_nswindow (window->window));
#elif defined(GDK_WINDOWING_X11) #elif defined(GDK_WINDOWING_X11)
gst_video_overlay_set_window_handle (videooverlay, gst_video_overlay_set_window_handle (videooverlay,
GDK_WINDOW_XWINDOW (window->window)); GDK_WINDOW_XWINDOW (window->window));