Commit 3aceca60 authored by Thomas Guillem's avatar Thomas Guillem

vout: ios: always call reshape from MainThread

We can safely remove the last call to reshape from the vout thread since
reshape is called from the glESView object when it is created.
parent e3a38e5a
...@@ -123,7 +123,6 @@ vlc_module_end () ...@@ -123,7 +123,6 @@ vlc_module_end ()
- (void)updateVoutCfg:(const vout_display_cfg_t *)cfg withVGL:(vout_display_opengl_t *)vgl; - (void)updateVoutCfg:(const vout_display_cfg_t *)cfg withVGL:(vout_display_opengl_t *)vgl;
- (void)getPlaceLocked:(vout_display_place_t *)place; - (void)getPlaceLocked:(vout_display_place_t *)place;
- (void)reshape;
@end @end
struct vout_display_sys_t struct vout_display_sys_t
...@@ -234,7 +233,6 @@ static int Open(vlc_object_t *this) ...@@ -234,7 +233,6 @@ static int Open(vlc_object_t *this)
selector:@selector(applicationStateChanged:) selector:@selector(applicationStateChanged:)
name:UIApplicationDidBecomeActiveNotification name:UIApplicationDidBecomeActiveNotification
object:nil]; object:nil];
[sys->glESView reshape];
return VLC_SUCCESS; return VLC_SUCCESS;
bailout: bailout:
...@@ -675,13 +673,7 @@ static void GLESSwap(vlc_gl_t *gl) ...@@ -675,13 +673,7 @@ static void GLESSwap(vlc_gl_t *gl)
- (void)reshape - (void)reshape
{ {
if (![NSThread isMainThread]) assert([NSThread isMainThread]);
{
[self performSelectorOnMainThread:@selector(reshape)
withObject:nil
waitUntilDone:YES];
return;
}
vlc_mutex_lock(&_mutex); vlc_mutex_lock(&_mutex);
if (!_voutDisplay) if (!_voutDisplay)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment