mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2024-12-22 08:17:01 +00:00
[331/906] indent and fix some compiler warnings
This commit is contained in:
parent
2eb9cb551c
commit
d1bd71e82b
2 changed files with 22 additions and 22 deletions
|
@ -380,7 +380,7 @@ gst_gl_window_new (gint width, gint height, guint64 external_gl_context)
|
||||||
|
|
||||||
priv->gl_context =
|
priv->gl_context =
|
||||||
glXCreateContext (priv->device, priv->visual_info,
|
glXCreateContext (priv->device, priv->visual_info,
|
||||||
(GLXContext) external_gl_context, TRUE);
|
(GLXContext) (guint) external_gl_context, TRUE);
|
||||||
|
|
||||||
g_debug ("gl context id: %ld\n", (gulong) priv->gl_context);
|
g_debug ("gl context id: %ld\n", (gulong) priv->gl_context);
|
||||||
|
|
||||||
|
@ -623,13 +623,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
|
||||||
if (priv->running) {
|
if (priv->running) {
|
||||||
#if SIZEOF_VOID_P == 8
|
#if SIZEOF_VOID_P == 8
|
||||||
GstGLWindowCB custom_cb =
|
GstGLWindowCB custom_cb =
|
||||||
(GstGLWindowCB) (((event.xclient.
|
(GstGLWindowCB) (((event.xclient.data.
|
||||||
data.l[0] & 0xffffffff) << 32) | (event.xclient.
|
l[0] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[1] & 0xffffffff));
|
l[1] & 0xffffffff));
|
||||||
gpointer custom_data =
|
gpointer custom_data =
|
||||||
(gpointer) (((event.xclient.
|
(gpointer) (((event.xclient.data.
|
||||||
data.l[2] & 0xffffffff) << 32) | (event.xclient.
|
l[2] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[3] & 0xffffffff));
|
l[3] & 0xffffffff));
|
||||||
#else
|
#else
|
||||||
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
||||||
gpointer custom_data = (gpointer) event.xclient.data.l[1];
|
gpointer custom_data = (gpointer) event.xclient.data.l[1];
|
||||||
|
@ -666,13 +666,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
|
||||||
&& event.xclient.message_type == wm_quit_loop) {
|
&& event.xclient.message_type == wm_quit_loop) {
|
||||||
#if SIZEOF_VOID_P == 8
|
#if SIZEOF_VOID_P == 8
|
||||||
GstGLWindowCB destroy_cb =
|
GstGLWindowCB destroy_cb =
|
||||||
(GstGLWindowCB) (((event.xclient.
|
(GstGLWindowCB) (((event.xclient.data.
|
||||||
data.l[0] & 0xffffffff) << 32) | (event.xclient.
|
l[0] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[1] & 0xffffffff));
|
l[1] & 0xffffffff));
|
||||||
gpointer destroy_data =
|
gpointer destroy_data =
|
||||||
(gpointer) (((event.xclient.
|
(gpointer) (((event.xclient.data.
|
||||||
data.l[2] & 0xffffffff) << 32) | (event.xclient.
|
l[2] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[3] & 0xffffffff));
|
l[3] & 0xffffffff));
|
||||||
#else
|
#else
|
||||||
GstGLWindowCB destroy_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
GstGLWindowCB destroy_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
||||||
gpointer destroy_data = (gpointer) event.xclient.data.l[1];
|
gpointer destroy_data = (gpointer) event.xclient.data.l[1];
|
||||||
|
@ -689,13 +689,13 @@ gst_gl_window_run_loop (GstGLWindow * window)
|
||||||
while (XCheckTypedEvent (priv->device, ClientMessage, &pending_event)) {
|
while (XCheckTypedEvent (priv->device, ClientMessage, &pending_event)) {
|
||||||
#if SIZEOF_VOID_P == 8
|
#if SIZEOF_VOID_P == 8
|
||||||
GstGLWindowCB custom_cb =
|
GstGLWindowCB custom_cb =
|
||||||
(GstGLWindowCB) (((event.xclient.
|
(GstGLWindowCB) (((event.xclient.data.
|
||||||
data.l[0] & 0xffffffff) << 32) | (event.xclient.
|
l[0] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[1] & 0xffffffff));
|
l[1] & 0xffffffff));
|
||||||
gpointer custom_data =
|
gpointer custom_data =
|
||||||
(gpointer) (((event.xclient.
|
(gpointer) (((event.xclient.data.
|
||||||
data.l[2] & 0xffffffff) << 32) | (event.xclient.
|
l[2] & 0xffffffff) << 32) | (event.xclient.data.
|
||||||
data.l[3] & 0xffffffff));
|
l[3] & 0xffffffff));
|
||||||
#else
|
#else
|
||||||
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
GstGLWindowCB custom_cb = (GstGLWindowCB) event.xclient.data.l[0];
|
||||||
gpointer custom_data = (gpointer) event.xclient.data.l[1];
|
gpointer custom_data = (gpointer) event.xclient.data.l[1];
|
||||||
|
|
|
@ -395,8 +395,8 @@ gst_gl_window_new (gint width, gint height, guint64 external_gl_context)
|
||||||
(gulong) priv->gl_display, EGLErrorString ());
|
(gulong) priv->gl_display, EGLErrorString ());
|
||||||
|
|
||||||
priv->gl_context =
|
priv->gl_context =
|
||||||
eglCreateContext (priv->gl_display, config, (EGLContext) external_gl_context,
|
eglCreateContext (priv->gl_display, config,
|
||||||
context_attrib);
|
(EGLContext) (guint) external_gl_context, context_attrib);
|
||||||
if (priv->gl_context != EGL_NO_CONTEXT)
|
if (priv->gl_context != EGL_NO_CONTEXT)
|
||||||
g_debug ("gl context created: %ld\n", (gulong) priv->gl_context);
|
g_debug ("gl context created: %ld\n", (gulong) priv->gl_context);
|
||||||
else
|
else
|
||||||
|
|
Loading…
Reference in a new issue