set_capability("vout display", 300)
set_callbacks(Open, Close)
- add_shortcut("macosx")
- add_shortcut("vout_macosx")
+ add_shortcut("macosx", "vout_macosx")
vlc_module_end ()
/**
msg_Dbg(vd, "No drawable-nsobject, passing over.");
goto error;
}
+ vout_display_DeleteWindow(vd, NULL);
/* This will be released in Close(), on
* main thread, after we are done using it. */
/* We don't wait, that means that we'll have to be careful about releasing
* container.
* That's why we'll release on main thread in Close(). */
- [(id)container performSelectorOnMainThread:@selector(addVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ if ([(id)container respondsToSelector:@selector(addVoutSubview:)])
+ [(id)container performSelectorOnMainThread:@selector(addVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ else if ([container isKindOfClass:[NSView class]])
+ {
+ NSView *parentView = container;
+ [parentView performSelectorOnMainThread:@selector(addSubview:) withObject:sys->glView waitUntilDone:NO];
+ [sys->glView performSelectorOnMainThread:@selector(setFrame:) withObject:[NSValue valueWithRect:[parentView bounds]] waitUntilDone:NO];
+ }
+ else
+ {
+ msg_Err(vd, "Invalid drawable-nsobject object. drawable-nsobject must either be an NSView or comply to the @protocol VLCOpenGLVideoViewEmbedding.");
+ goto error;
+ }
+
+
[nsPool release];
nsPool = nil;
[sys->glView setVoutDisplay:nil];
var_Destroy(vd, "drawable-nsobject");
- /* This will retain sys->glView */
- [(id)sys->container performSelectorOnMainThread:@selector(removeVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ if ([(id)sys->container respondsToSelector:@selector(removeVoutSubview:)])
+ {
+ /* This will retain sys->glView */
+ [(id)sys->container performSelectorOnMainThread:@selector(removeVoutSubview:) withObject:sys->glView waitUntilDone:NO];
+ }
/* release on main thread as explained in Open() */
[(id)sys->container performSelectorOnMainThread:@selector(release) withObject:nil waitUntilDone:NO];
[sys->glView performSelectorOnMainThread:@selector(removeFromSuperview) withObject:nil waitUntilDone:NO];
GLint params[] = { 1 };
CGLSetParameter([[self openGLContext] CGLContextObj], kCGLCPSwapInterval, params);
+ [self setAutoresizingMask:NSViewWidthSizable | NSViewHeightSizable];
return self;
}
- (BOOL)lockgl
{
VLCAssertMainThread();
- CGLError err = CGLLockContext([[self openGLContext] CGLContextObj]);
+ NSOpenGLContext *context = [self openGLContext];
+ CGLError err = CGLLockContext([context CGLContextObj]);
+ if (err == kCGLNoError)
+ [context makeCurrentContext];
return err == kCGLNoError;
}
}
}
- [self lockgl];
+ if ([self lockgl]) {
+ glViewport((width - x) / 2, (height - y) / 2, x, y);
- glViewport((width - x) / 2, (height - y) / 2, x, y);
-
- @synchronized(self) {
- // This may be cleared before -drawRect is being called,
- // in this case we'll skip the rendering.
- // This will save us for rendering two frames (or more) for nothing
- // (one by the vout, one (or more) by drawRect)
- _hasPendingReshape = YES;
- }
+ @synchronized(self) {
+ // This may be cleared before -drawRect is being called,
+ // in this case we'll skip the rendering.
+ // This will save us for rendering two frames (or more) for nothing
+ // (one by the vout, one (or more) by drawRect)
+ _hasPendingReshape = YES;
+ }
- [self unlockgl];
+ [self unlockgl];
- [super reshape];
+ [super reshape];
+ }
}
/**