mirrors/gstreamer
mirrors/gstreamer
1
1
Fork 0
mirror of https://gitlab.freedesktop.org/gstreamer/gstreamer.git synced 2025-04-26 06:54:49 +00:00
Code Issues 1 Projects Releases Wiki Activity

osxvideosink: close the internal window correctly

Browse source
This commit is contained in:
Andoni Morales Alastruey 2013-07-07 22:16:05 +02:00
parent 213fa3af0d
commit 0e321b87d4
1 changed files with 16 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
sys/osxvideo/osxvideosink.m
View file

@ -674,6 +674,7 @@ gst_osx_video_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle
{ {
GstOSXVideoSink *osxvideosink = GST_OSX_VIDEO_SINK (overlay); GstOSXVideoSink *osxvideosink = GST_OSX_VIDEO_SINK (overlay);
gulong window_id = (gulong) handle_id; gulong window_id = (gulong) handle_id;
NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init];
if (osxvideosink->superview) { if (osxvideosink->superview) {
GST_INFO_OBJECT (osxvideosink, "old xwindow id %p", osxvideosink->superview); GST_INFO_OBJECT (osxvideosink, "old xwindow id %p", osxvideosink->superview);
@ -684,6 +685,14 @@ gst_osx_video_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle
} }
[osxvideosink->superview release]; [osxvideosink->superview release];
} }
if (osxvideosink->osxwindow != NULL && window_id != 0) {
if (osxvideosink->osxwindow->internal) {
GST_INFO_OBJECT (osxvideosink, "closing internal window");
osxvideosink->osxwindow->closed = TRUE;
[osxvideosink->osxwindow->win close];
[osxvideosink->osxwindow->win release];
}
}
GST_INFO_OBJECT (osxvideosink, "set xwindow id 0x%lx", window_id); GST_INFO_OBJECT (osxvideosink, "set xwindow id 0x%lx", window_id);
osxvideosink->superview = [((NSView *) window_id) retain]; osxvideosink->superview = [((NSView *) window_id) retain];
@ -696,6 +705,7 @@ gst_osx_video_sink_set_window_handle (GstVideoOverlay * overlay, guintptr handle
} }
} }
[pool release];
} }
static void static void
@ -770,6 +780,9 @@ gst_osx_video_sink_get_type (void)
- (void)windowWillClose:(NSNotification *)notification { - (void)windowWillClose:(NSNotification *)notification {
/* Only handle close events if the window was closed manually by the user /* Only handle close events if the window was closed manually by the user
* and not becuase of a state change state to READY */ * and not becuase of a state change state to READY */
if (osxvideosink->osxwindow == NULL) {
return;
}
if (!osxvideosink->osxwindow->closed) { if (!osxvideosink->osxwindow->closed) {
osxvideosink->osxwindow->closed = TRUE; osxvideosink->osxwindow->closed = TRUE;
GST_ELEMENT_ERROR (osxvideosink, RESOURCE, NOT_FOUND, ("Output window was closed"), (NULL)); GST_ELEMENT_ERROR (osxvideosink, RESOURCE, NOT_FOUND, ("Output window was closed"), (NULL));
@ -821,12 +834,12 @@ gst_osx_video_sink_get_type (void)
SetFrontProcess(&psn); SetFrontProcess(&psn);
} }
osxwindow->win =[[GstOSXVideoSinkWindow alloc] osxwindow->win =[[[GstOSXVideoSinkWindow alloc]
initWithContentNSRect: rect initWithContentNSRect: rect
styleMask: mask styleMask: mask
backing: NSBackingStoreBuffered backing: NSBackingStoreBuffered
defer: NO defer: NO
screen: nil]; screen: nil] retain];
GST_DEBUG("VideoSinkWindow created, %p", osxwindow->win); GST_DEBUG("VideoSinkWindow created, %p", osxwindow->win);
[osxwindow->win makeKeyAndOrderFront:NSApp]; [osxwindow->win makeKeyAndOrderFront:NSApp];
osxwindow->gstview =[osxwindow->win gstView]; osxwindow->gstview =[osxwindow->win gstView];
@ -907,6 +920,7 @@ gst_osx_video_sink_get_type (void)
if (osxwindow->internal) { if (osxwindow->internal) {
if (!osxwindow->closed) { if (!osxwindow->closed) {
osxwindow->closed = TRUE; osxwindow->closed = TRUE;
[osxwindow->win close];
[osxwindow->win release]; [osxwindow->win release];
} }
} }