diff options
author | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-17 11:22:02 +0200 |
---|---|---|
committer | Sebastian Dröge <slomo@circular-chaos.org> | 2013-07-17 11:22:02 +0200 |
commit | 4c2c1918a2685a197b835bfa42730f416e88168d (patch) | |
tree | 35e64789edb952d29d7e643048ecf18493e56516 | |
parent | 74dda28907cab7cd39f6961f86172d0001aa9208 (diff) |
gl: Some less long/ulong/gulong usage
-rw-r--r-- | gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m | 4 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglfilter.c | 2 | ||||
-rw-r--r-- | gst-libs/gst/gl/gstglfilter.h | 2 | ||||
-rw-r--r-- | gst-libs/gst/gl/win32/gstglwindow_win32_egl.c | 4 | ||||
-rw-r--r-- | gst/gl/gstglimagesink.c | 2 | ||||
-rw-r--r-- | gst/gl/gstglimagesink.h | 4 | ||||
-rwxr-xr-x | tests/examples/cocoa/videooverlay/main.m | 2 | ||||
-rw-r--r-- | tests/examples/gtk/gstgtk.c | 4 | ||||
-rw-r--r-- | tests/examples/qt/mousevideooverlay/pipeline.cpp | 2 | ||||
-rw-r--r-- | tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp | 2 | ||||
-rw-r--r-- | tests/examples/qt/videooverlay/pipeline.cpp | 2 |
11 files changed, 15 insertions, 15 deletions
diff --git a/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m b/gst-libs/gst/gl/cocoa/gstglwindow_cocoa.m index a6e9937..c8b45d8 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 31cceab..85b12de 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 3b5c133..61b011c 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 8f046e8..6229c51 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; } diff --git a/gst/gl/gstglimagesink.c b/gst/gl/gstglimagesink.c index 0b04f73..c96f867 100644 --- a/gst/gl/gstglimagesink.c +++ b/gst/gl/gstglimagesink.c @@ -744,7 +744,7 @@ static void gst_glimage_sink_set_window_handle (GstVideoOverlay * overlay, guintptr id) { 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)); diff --git a/gst/gl/gstglimagesink.h b/gst/gl/gstglimagesink.h index 884b567..6da610b 100644 --- a/gst/gl/gstglimagesink.h +++ b/gst/gl/gstglimagesink.h @@ -54,8 +54,8 @@ struct _GstGLImageSink //properties gchar *display_name; - gulong window_id; - gulong new_window_id; + guintptr window_id; + guintptr new_window_id; //caps GstVideoInfo info; diff --git a/tests/examples/cocoa/videooverlay/main.m b/tests/examples/cocoa/videooverlay/main.m index db7f5a3..8f959fe 100755 --- a/tests/examples/cocoa/videooverlay/main.m +++ b/tests/examples/cocoa/videooverlay/main.m @@ -91,7 +91,7 @@ static GstBusSyncReply create_window (GstBus* bus, GstMessage* message, MainWind g_print ("setting window handle %lud\n", (gulong) window); - gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (gulong) window); + gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (guintptr) window); gst_message_unref (message); diff --git a/tests/examples/gtk/gstgtk.c b/tests/examples/gtk/gstgtk.c index dc680a1..5dcdcdc 100644 --- a/tests/examples/gtk/gstgtk.c +++ b/tests/examples/gtk/gstgtk.c @@ -41,10 +41,10 @@ gst_video_overlay_set_gtk_window (GstVideoOverlay * videooverlay, #if defined(GDK_WINDOWING_WIN32) gst_video_overlay_set_window_handle (videooverlay, - (gulong) GDK_WINDOW_HWND (window->window)); + (guintptr) GDK_WINDOW_HWND (window->window)); #elif defined(GDK_WINDOWING_QUARTZ) 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) gst_video_overlay_set_window_handle (videooverlay, GDK_WINDOW_XWINDOW (window->window)); diff --git a/tests/examples/qt/mousevideooverlay/pipeline.cpp b/tests/examples/qt/mousevideooverlay/pipeline.cpp index 21a9a31..2e9b129 100644 --- a/tests/examples/qt/mousevideooverlay/pipeline.cpp +++ b/tests/examples/qt/mousevideooverlay/pipeline.cpp @@ -326,7 +326,7 @@ GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const //Passing 0 as the window_handle will tell the overlay to stop using that window and create an internal one. //In the directdrawsink's gst_video_overlay_set_window_handle implementation, window_handle (parameter 2) is casted to HWND before it used. - gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); + gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (guintptr)p->winId()); gst_message_unref (message); diff --git a/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp b/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp index 5aaa1f8..7e58b23 100644 --- a/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp +++ b/tests/examples/qt/qglwidgetvideooverlay/pipeline.cpp @@ -324,7 +324,7 @@ GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const //Passing 0 as the window_handle will tell the overlay to stop using that window and create an internal one. //In the directdrawsink's gst_video_overlay_set_window_handle implementation, window_handle (parameter 2) is casted to HWND before it used. - gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); + gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (guintptr)p->winId()); gst_message_unref (message); diff --git a/tests/examples/qt/videooverlay/pipeline.cpp b/tests/examples/qt/videooverlay/pipeline.cpp index bc60c07..b5c6493 100644 --- a/tests/examples/qt/videooverlay/pipeline.cpp +++ b/tests/examples/qt/videooverlay/pipeline.cpp @@ -263,7 +263,7 @@ GstBusSyncReply Pipeline::create_window (GstBus* bus, GstMessage* message, const //Passing 0 as the window_handle will tell the overlay to stop using that window and create an internal one. //In the directdrawsink's gst_video_overlay_set_window_handle implementation, window_handle (parameter 2) is casted to HWND before it used. - gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (ulong)p->winId()); + gst_video_overlay_set_window_handle (GST_VIDEO_OVERLAY (GST_MESSAGE_SRC (message)), (guintptr)p->winId()); gst_message_unref (message); |