mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2024-12-18 06:16:36 +00:00
Code Issues 1 Projects Releases Wiki Activity

[742/906] cocoa: Allow setting window handle before creating the context

Browse source
This commit is contained in:
Sebastian Dröge 2013-07-11 21:22:57 +02:00 committed by Tim-Philipp Müller
parent d937a7e899
commit bd60dd7f22
1 changed files with 21 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -226,7 +226,6 @@ gst_gl_window_cocoa_create_context (GstGLWindow *window, GstGLAPI gl_api,
priv->gl_context = nil; priv->gl_context = nil;
priv->external_gl_context = (NSOpenGLContext *) external_gl_context; priv->external_gl_context = (NSOpenGLContext *) external_gl_context;
priv->visible = FALSE; priv->visible = FALSE;
priv->parent = nil;
priv->thread = nil; priv->thread = nil;
priv->running = TRUE; priv->running = TRUE;
@ -249,13 +248,13 @@ gst_gl_window_cocoa_create_context (GstGLWindow *window, GstGLAPI gl_api,
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", (gulong) priv->internal_win_id);
priv->thread = [NSThread currentThread]; priv->thread = [NSThread currentThread];
[NSApp setDelegate: priv->internal_win_id]; [NSApp setDelegate: priv->internal_win_id];
[pool release]; [pool release];
#ifndef GNUSTEP #ifndef GNUSTEP
priv->source_id = g_timeout_add_seconds (1, gst_gl_window_cocoa_nsapp_iteration, NULL); priv->source_id = g_timeout_add_seconds (1, gst_gl_window_cocoa_nsapp_iteration, NULL);
#endif #endif
@ -297,22 +296,24 @@ gst_gl_window_cocoa_set_window_handle (GstGLWindow * window, guintptr handle)
window_cocoa = GST_GL_WINDOW_COCOA (window); window_cocoa = GST_GL_WINDOW_COCOA (window);
priv = window_cocoa->priv; priv = window_cocoa->priv;
g_source_remove (priv->source_id); priv->parent = (NSWindow*) handle;
if (priv->internal_win_id) {
g_source_remove (priv->source_id);
if (GSRegisterCurrentThread()) { if (GSRegisterCurrentThread()) {
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
AppThreadPerformer* app_thread_performer = [[AppThreadPerformer alloc] init:window_cocoa]; AppThreadPerformer* app_thread_performer = [[AppThreadPerformer alloc] init:window_cocoa];
priv->parent = (NSWindow*) handle; [app_thread_performer performSelectorOnMainThread:@selector(setWindow)
[app_thread_performer performSelectorOnMainThread:@selector(setWindow) withObject:0 waitUntilDone:YES];
withObject:0 waitUntilDone:YES];
[pool release]; [pool release];
GSUnregisterCurrentThread(); GSUnregisterCurrentThread();
} else {
GST_DEBUG ("failed to register current thread, cannot set external window id\n");
}
} }
else
GST_DEBUG ("failed to register current thread, cannot set external window id\n");
} }
/* Thread safe */ /* Thread safe */
@ -564,6 +565,12 @@ gst_gl_window_cocoa_get_gl_api (GstGLWindow * window)
[self orderOut:m_cocoa->priv->internal_win_id]; [self orderOut:m_cocoa->priv->internal_win_id];
if (m_cocoa->priv->parent) {
NSWindow *window = m_cocoa->priv->parent;
[window setContentView: [m_cocoa->priv->internal_win_id contentView]];
}
return self; return self;
} }