vlc_module_begin ()
/* Will be loaded even without interface module. see voutgl.m */
set_shortname ("Mac OS X")
- set_description (N_("Mac OS X OpenGL video output (requires drawable-nsobject)"))
+ set_description (N_("Mac OS X OpenGL video output"))
set_category (CAT_VIDEO)
set_subcategory (SUBCAT_VIDEO_VOUT)
set_capability ("vout display", 300)
if (!sys)
return VLC_ENOMEM;
- if (!CGDisplayUsesOpenGLAcceleration (kCGDirectMainDisplay)) {
+ if (!CGDisplayUsesOpenGLAcceleration (kCGDirectMainDisplay))
msg_Err (this, "no OpenGL hardware acceleration found. this can lead to slow output and unexpected results");
- dialog_Fatal (this, _("OpenGL acceleration is not supported on your Mac"), _("Your Mac lacks Quartz Extreme acceleration, which is required for video output. It will still work, but much slower and with possibly unexpected results."));
- } else
- msg_Dbg (this, "Quartz Extreme acceleration is active");
vd->sys = sys;
sys->pool = NULL;
if (container)
vout_display_DeleteWindow (vd, NULL);
else {
- vout_window_cfg_t wnd_cfg;
-
- memset (&wnd_cfg, 0, sizeof (wnd_cfg));
- wnd_cfg.type = VOUT_WINDOW_TYPE_NSOBJECT;
- wnd_cfg.x = var_InheritInteger (vd, "video-x");
- wnd_cfg.y = var_InheritInteger (vd, "video-y");
- wnd_cfg.width = vd->cfg->display.width;
- wnd_cfg.height = vd->cfg->display.height;
-
- sys->embed = vout_display_NewWindow (vd, &wnd_cfg);
+ sys->embed = vout_display_NewWindow (vd, VOUT_WINDOW_TYPE_NSOBJECT);
if (sys->embed)
container = sys->embed->handle.nsobject;
nsPool = [[NSAutoreleasePool alloc] init];
[VLCOpenGLVideoView performSelectorOnMainThread:@selector(getNewView:) withObject:[NSValue valueWithPointer:&sys->glView] waitUntilDone:YES];
- if (!sys->glView)
+ if (!sys->glView) {
+ msg_Err(vd, "Initialization of open gl view failed");
goto error;
+ }
[sys->glView setVoutDisplay:vd];
sys->gl.getProcAddress = OurGetProcAddress;
sys->gl.sys = sys;
const vlc_fourcc_t *subpicture_chromas;
- video_format_t fmt = vd->fmt;
sys->vgl = vout_display_opengl_New (&vd->fmt, &subpicture_chromas, &sys->gl);
if (!sys->vgl) {
vd->control = Control;
/* */
- vout_display_SendEventDisplaySize (vd, vd->source.i_visible_width, vd->source.i_visible_height, false);
+ vout_display_SendEventDisplaySize (vd, vd->fmt.i_visible_width, vd->fmt.i_visible_height);
return VLC_SUCCESS;
switch (query)
{
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- {
- const vout_display_cfg_t *cfg = va_arg (ap, const vout_display_cfg_t *);
- if (vout_window_SetFullScreen (sys->embed, cfg->is_fullscreen))
- return VLC_EGENERIC;
-
- return VLC_SUCCESS;
- }
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
- {
- unsigned state = va_arg (ap, unsigned);
- return vout_window_SetState (sys->embed, state);
- }
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
const vout_display_cfg_t *cfg;
const video_format_t *source;
- bool is_forced = false;
if (query == VOUT_DISPLAY_CHANGE_SOURCE_ASPECT || query == VOUT_DISPLAY_CHANGE_SOURCE_CROP) {
source = (const video_format_t *)va_arg (ap, const video_format_t *);
} else {
source = &vd->source;
cfg = (const vout_display_cfg_t*)va_arg (ap, const vout_display_cfg_t *);
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
- is_forced = (bool)va_arg (ap, int);
}
- if (query == VOUT_DISPLAY_CHANGE_DISPLAY_SIZE && is_forced
- && (cfg->display.width != vd->cfg->display.width
- || cfg->display.height != vd->cfg->display.height)
- && vout_window_SetSize (sys->embed, cfg->display.width, cfg->display.height)) {
- [o_pool release];
- return VLC_EGENERIC;
- }
-
/* we always use our current frame here, because we have some size constraints
in the ui vout provider */
vout_display_cfg_t cfg_tmp = *cfg;
return VLC_SUCCESS;
}
- case VOUT_DISPLAY_GET_OPENGL:
- {
- vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
- *gl = &sys->gl;
- return VLC_SUCCESS;
- }
-
case VOUT_DISPLAY_RESET_PICTURES:
assert (0);
default:
else
bounds = [self bounds];
vout_display_place_t place;
-
+
@synchronized(self) {
if (vd) {
vout_display_cfg_t cfg_tmp = *(vd->cfg);
vout_display_PlacePicture (&place, &vd->source, &cfg_tmp, false);
vd->sys->place = place;
- vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height, vd->cfg->is_fullscreen);
+ vout_display_SendEventDisplaySize (vd, bounds.size.width, bounds.size.height);
}
}
- (void)mouseMoved:(NSEvent *)o_event
{
- NSPoint ml;
- NSRect s_rect;
- BOOL b_inside;
-
/* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */
- if (OSX_LION)
- s_rect = [self convertRectToBacking:[self bounds]];
- else
- s_rect = [self bounds];
- ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
- b_inside = [self mouse: ml inRect: s_rect];
-
+ NSPoint ml = [self convertPoint: [o_event locationInWindow] fromView: nil];
+ NSRect videoRect = [self bounds];
+ BOOL b_inside = [self mouse: ml inRect: videoRect];
+
+ if (OSX_LION) {
+ ml = [self convertPointToBacking: ml];
+ videoRect = [self convertRectToBacking: videoRect];
+ }
+
if (b_inside) {
@synchronized (self) {
if (vd) {
- vout_display_place_t place = vd->sys->place;
-
- if (place.width > 0 && place.height > 0) {
- const int x = vd->source.i_x_offset +
- (int64_t)(ml.x - place.x) * vd->source.i_visible_width / place.width;
- const int y = vd->source.i_y_offset +
- (int64_t)((int)s_rect.size.height - (int)ml.y - place.y) * vd->source.i_visible_height / place.height;
-
- vout_display_SendEventMouseMoved (vd, x, y);
- }
+ vout_display_SendMouseMovedDisplayCoordinates(vd, ORIENT_NORMAL,
+ (int)ml.x, videoRect.size.height - (int)ml.y,
+ &vd->sys->place);
}
}
}