mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-11-28 04:31:06 +00:00
Code Issues 1 Projects Releases Wiki Activity

[731/906] cocoa: fix build when GNUSTEP is not defined

Browse source
This commit is contained in:
Julien Isorce 2013-07-10 15:47:23 +01:00 committed by Matthew Waters
parent a98180cd53
commit 3c0b9715a9
1 changed files with 11 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -22,10 +22,9 @@
#include "config.h" #include "config.h"
#endif #endif
#include "gstglwindow_cocoa.h"
#include <Cocoa/Cocoa.h> #include <Cocoa/Cocoa.h>
#include "gstglwindow_cocoa.h"
/* =============================================================*/ /* =============================================================*/
/* */ /* */
@ -165,6 +164,10 @@ gst_gl_window_cocoa_class_init (GstGLWindowCocoaClass * klass)
{ {
GstGLWindowClass *window_class; GstGLWindowClass *window_class;
#ifndef GNUSTEP
NSAutoreleasePool* pool = nil;
#endif
window_class = (GstGLWindowClass *) klass; window_class = (GstGLWindowClass *) klass;
g_type_class_add_private (klass, sizeof (GstGLWindowCocoaPrivate)); g_type_class_add_private (klass, sizeof (GstGLWindowCocoaPrivate));
@ -186,7 +189,7 @@ gst_gl_window_cocoa_class_init (GstGLWindowCocoaClass * klass)
GST_DEBUG_FUNCPTR (gst_gl_window_cocoa_get_gl_api); GST_DEBUG_FUNCPTR (gst_gl_window_cocoa_get_gl_api);
#ifndef GNUSTEP #ifndef GNUSTEP
NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; pool = [[NSAutoreleasePool alloc] init];
[NSApplication sharedApplication]; [NSApplication sharedApplication];
[pool release]; [pool release];
@ -521,7 +524,7 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window)
GST_DEBUG ("NSOpenGL context created: %lud\n", (gulong) glContext); GST_DEBUG ("NSOpenGL context created: %lud\n", (gulong) glContext);
priv->gl_context = glContext; m_cocoa->priv->gl_context = glContext;
[glView setOpenGLContext:glContext]; [glView setOpenGLContext:glContext];
#else #else
@ -769,7 +772,9 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window)
} }
- (void) stopApp { - (void) stopApp {
NSAutoreleasePool *pool; #ifdef GNUSTEP
NSAutoreleasePool *pool = nil;
#endif
m_cocoa->priv->running = FALSE; m_cocoa->priv->running = FALSE;
if (m_callback) if (m_callback)