From 9968b512c549d0f88e1ee46b44cc065e6302eaf8 Mon Sep 17 00:00:00 2001 From: Matthew Waters Date: Wed, 11 Mar 2015 14:50:28 +0000 Subject: [PATCH] gl/window: hopefully fixup compile warnings on android/ios --- gst-libs/gst/gl/android/gstglwindow_android_egl.c | 7 +------ gst-libs/gst/gl/eagl/gstglwindow_eagl.m | 9 ++++----- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/gst-libs/gst/gl/android/gstglwindow_android_egl.c b/gst-libs/gst/gl/android/gstglwindow_android_egl.c index cbc0f7b2ed..f3c5436bee 100644 --- a/gst-libs/gst/gl/android/gstglwindow_android_egl.c +++ b/gst-libs/gst/gl/android/gstglwindow_android_egl.c @@ -89,7 +89,7 @@ gst_gl_window_android_egl_init (GstGLWindowAndroidEGL * window) static void gst_gl_window_android_egl_finalize (GObject * object) { - GstGLWindowAndroidEGL *window_egl GST_GL_WINDOW_ANDROID_EGL (object); + GstGLWindowAndroidEGL *window_egl = GST_GL_WINDOW_ANDROID_EGL (object); g_main_loop_unref (window_egl->loop); g_main_context_unref (window_egl->main_context); @@ -113,17 +113,12 @@ gst_gl_window_android_egl_new (void) static gboolean gst_gl_window_android_egl_open (GstGLWindow * window, GError ** error) { - GstGLWindowAndroidEGL *window_egl; - return TRUE; } static void gst_gl_window_android_egl_close (GstGLWindow * window) { - GstGLWindowAndroidEGL *window_egl; - - window_egl = GST_GL_WINDOW_ANDROID_EGL (window); } static void diff --git a/gst-libs/gst/gl/eagl/gstglwindow_eagl.m b/gst-libs/gst/gl/eagl/gstglwindow_eagl.m index 5f748d3e37..f1fc8b8f57 100644 --- a/gst-libs/gst/gl/eagl/gstglwindow_eagl.m +++ b/gst-libs/gst/gl/eagl/gstglwindow_eagl.m @@ -99,18 +99,17 @@ gst_gl_window_eagl_init (GstGLWindowEagl * window) { window->priv = GST_GL_WINDOW_EAGL_GET_PRIVATE (window); - window_eagl->priv->main_context = g_main_context_new (); - window_eagl->priv->loop = - g_main_loop_new (window_eagl->priv->main_context, FALSE); + window->priv->main_context = g_main_context_new (); + window->priv->loop = g_main_loop_new (window->priv->main_context, FALSE); } static void gst_gl_window_eagl_finalize (GObject * object) { - GstGLWindowWaylandEagl *window_eagl = GST_GL_WINDOW_EAGL (object); + GstGLWindowEagl *window_eagl = GST_GL_WINDOW_EAGL (object); g_main_loop_unref (window_eagl->priv->loop); - g_main_context_unref (window_egl->priv->main_context); + g_main_context_unref (window_eagl->priv->main_context); G_OBJECT_CLASS (parent_class)->finalize (object); }