/*****************************************************************************
* ios2.m: iOS OpenGL ES 2 provider
*****************************************************************************
- * Copyright (C) 2001-2013 VLC authors and VideoLAN
+ * Copyright (C) 2001-2014 VLC authors and VideoLAN
* $Id$
*
* Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
static int Open(vlc_object_t *this)
{
vout_display_t *vd = (vout_display_t *)this;
+
+ if (vout_display_IsWindowed(vd))
+ return VLC_EGENERIC;
+
vout_display_sys_t *sys = calloc (1, sizeof(*sys));
NSAutoreleasePool *autoreleasePool = nil;
if (!viewContainer || ![viewContainer isKindOfClass:[UIView class]])
goto bailout;
- vout_display_DeleteWindow (vd, NULL);
-
/* This will be released in Close(), on
* main thread, after we are done using it. */
sys->viewContainer = [viewContainer retain];
[sys->glESView setVoutDisplay:vd];
- [sys->viewContainer performSelectorOnMainThread:@selector(addSubview:) withObject:sys->glESView waitUntilDone:YES];
+ [sys->viewContainer performSelectorOnMainThread:@selector(addSubview:)
+ withObject:sys->glESView
+ waitUntilDone:YES];
/* add tap gesture recognizer for DVD menus and stuff */
- //self.userInteractionEnabled = YES;
- sys->tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:sys->glESView action:@selector(tapRecognized:)];
+ sys->tapRecognizer = [[UITapGestureRecognizer alloc] initWithTarget:sys->glESView
+ action:@selector(tapRecognized:)];
sys->tapRecognizer.numberOfTapsRequired = 2;
if (sys->viewContainer.window) {
if (sys->viewContainer.window.rootViewController) {
const vlc_fourcc_t *subpicture_chromas;
video_format_t fmt = vd->fmt;
- sys->vgl = vout_display_opengl_New (&vd->fmt, &subpicture_chromas, &sys->gl);
+ sys->vgl = vout_display_opengl_New(&vd->fmt, &subpicture_chromas, &sys->gl);
if (!sys->vgl) {
sys->gl.sys = NULL;
goto bailout;
/* forward our dimensions to the vout core */
CGSize viewSize = sys->viewContainer.frame.size;
vout_display_SendEventFullscreen(vd, false);
- vout_display_SendEventDisplaySize(vd, (int)viewSize.width, (int)viewSize.height, false);
+ vout_display_SendEventDisplaySize(vd, (int)viewSize.width, (int)viewSize.height);
/* */
- [[NSNotificationCenter defaultCenter] addObserver:sys->glESView selector:@selector(applicationStateChanged:) name:UIApplicationWillResignActiveNotification object:nil];
- [[NSNotificationCenter defaultCenter] addObserver:sys->glESView selector:@selector(applicationStateChanged:) name:UIApplicationDidBecomeActiveNotification object:nil];
- [sys->glESView performSelectorOnMainThread:@selector(reshape) withObject:nil waitUntilDone:YES];
+ [[NSNotificationCenter defaultCenter] addObserver:sys->glESView
+ selector:@selector(applicationStateChanged:)
+ name:UIApplicationWillResignActiveNotification
+ object:nil];
+ [[NSNotificationCenter defaultCenter] addObserver:sys->glESView
+ selector:@selector(applicationStateChanged:)
+ name:UIApplicationDidBecomeActiveNotification
+ object:nil];
+ [sys->glESView performSelectorOnMainThread:@selector(reshape)
+ withObject:nil
+ waitUntilDone:YES];
[autoreleasePool release];
return VLC_SUCCESS;
case VOUT_DISPLAY_HIDE_MOUSE:
return VLC_EGENERIC;
- case VOUT_DISPLAY_CHANGE_FULLSCREEN:
- case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_SOURCE_ASPECT:
cfg = (const vout_display_cfg_t*)va_arg(ap, const vout_display_cfg_t *);
}
- /* we always use our current frame here, because we have some size constraints
- in the ui vout provider */
+ /* we don't adapt anything here regardless of what the vout core
+ * wants since we are not in a traditional desktop window */
if (!cfg)
return VLC_EGENERIC;
CGSize viewSize;
viewSize = [sys->glESView bounds].size;
- /* on HiDPI displays, the point bounds don't equal the actual pixel based bounds */
+ /* on HiDPI displays, the point bounds don't equal the actual pixels */
CGFloat scaleFactor = sys->glESView.contentScaleFactor;
cfg_tmp.display.width = viewSize.width * scaleFactor;
cfg_tmp.display.height = viewSize.height * scaleFactor;
sys->place = place;
}
- /* For resize, we call glViewport in reshape and not here.
- This has the positive side effect that we avoid erratic sizing as we animate every resize. */
-/* if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
- // x / y are top left corner, but we need the lower left one
- glViewport(place.x, cfg_tmp.display.height - (place.y + place.height), place.width, place.height);*/
+ // x / y are top left corner, but we need the lower left one
+ if (query != VOUT_DISPLAY_CHANGE_DISPLAY_SIZE)
+ glViewport(place.x, cfg_tmp.display.height - (place.y + place.height), place.width, place.height);
[autoreleasePool release];
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:
msg_Err(vd, "Unknown request %d", query);
+ case VOUT_DISPLAY_CHANGE_FULLSCREEN:
return VLC_EGENERIC;
}
}
- (id)initWithFrame:(CGRect)frame
{
- self = [super initWithFrame:frame]; // perform selector on main thread?
+ self = [super initWithFrame:frame];
if (!self)
return nil;
_bufferNeedReset = YES;
}
-/**
- * Method called by Cocoa when the view is resized.
- */
- (void)reshape
{
assert([[NSThread currentThread] isMainThread]);
vout_display_PlacePicture(&place, &_voutDisplay->source, &cfg_tmp, false);
_voutDisplay->sys->place = place;
- vout_display_SendEventDisplaySize(_voutDisplay, viewSize.width * scaleFactor, viewSize.height * scaleFactor, _voutDisplay->cfg->is_fullscreen);
+ vout_display_SendEventDisplaySize(_voutDisplay, viewSize.width * scaleFactor,
+ viewSize.height * scaleFactor);
}
}
{
UIGestureRecognizerState state = [tapRecognizer state];
CGPoint touchPoint = [tapRecognizer locationInView:self];
+ CGFloat scaleFactor = self.contentScaleFactor;
vout_display_SendMouseMovedDisplayCoordinates(_voutDisplay, ORIENT_NORMAL,
- (int)touchPoint.x, (int)touchPoint.y,
+ (int)touchPoint.x * scaleFactor, (int)touchPoint.y * scaleFactor,
&_voutDisplay->sys->place);
vout_display_SendEventMousePressed(_voutDisplay, MOUSE_BUTTON_LEFT);
- (void)applicationStateChanged:(NSNotification *)notification
{
- if ([[notification name] isEqualToString:UIApplicationWillResignActiveNotification] || [[notification name] isEqualToString:UIApplicationDidEnterBackgroundNotification] || [[notification name] isEqualToString:UIApplicationWillTerminateNotification])
+ if ([[notification name] isEqualToString:UIApplicationWillResignActiveNotification]
+ || [[notification name] isEqualToString:UIApplicationDidEnterBackgroundNotification]
+ || [[notification name] isEqualToString:UIApplicationWillTerminateNotification])
_appActive = NO;
else
_appActive = YES;
projects / vlc / blobdiff