videolan/vlc
1
Fork 0
mirror of https://code.videolan.org/videolan/vlc synced 2024-09-16 16:02:54 +02:00
Code Releases Activity

vout/ios: Rename confusingly named methods

Browse Source 
Signed-off-by: Thomas Guillem <thomas@gllm.fr>
This commit is contained in:
Marvin Scholz 2019-01-18 18:52:38 +01:00 committed by Thomas Guillem
parent f9c4af6e89
commit 565d3e9c8e
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
modules/video_output/ios.m
View File

@ -108,9 +108,9 @@ vlc_module_end ()
vout_display_cfg_t _cfg;
}
- (id)initWithFrameAndVd:(CGRect)frame withVd:(vout_display_t*)vd;
- (id)initWithFrame:(CGRect)frame andVD:(vout_display_t*)vd;
- (void)cleanAndRelease:(BOOL)flushed;
- (BOOL)makeCurrentWithGL:(EAGLContext **)previousEaglContext withGL:(vlc_gl_t *)gl;
- (BOOL)makeCurrent:(EAGLContext **)previousEaglContext withGL:(vlc_gl_t *)gl;
- (void)releaseCurrent:(EAGLContext *)previousEaglContext;
- (void)presentRenderbuffer;
@ -335,7 +335,7 @@ static int GLESMakeCurrent(vlc_gl_t *gl)
{
struct gl_sys *sys = gl->sys;
if (![sys->glESView makeCurrentWithGL:&sys->previousEaglContext withGL:gl])
if (![sys->glESView makeCurrent:&sys->previousEaglContext withGL:gl])
return VLC_EGENERIC;
return VLC_SUCCESS;
}
@ -369,10 +369,10 @@ static void GLESSwap(vlc_gl_t *gl)
{
id *ret = [[value objectAtIndex:0] pointerValue];
vout_display_t *vd = [[value objectAtIndex:1] pointerValue];
*ret = [[self alloc] initWithFrameAndVd:CGRectMake(0.,0.,320.,240.) withVd:vd];
*ret = [[self alloc] initWithFrame:CGRectMake(0.,0.,320.,240.) andVD:vd];
}
- (id)initWithFrameAndVd:(CGRect)frame withVd:(vout_display_t*)vd
- (id)initWithFrame:(CGRect)frame andVD:(vout_display_t*)vd
{
_appActive = ([UIApplication sharedApplication].applicationState == UIApplicationStateActive);
if (unlikely(!_appActive))
@ -581,7 +581,7 @@ static void GLESSwap(vlc_gl_t *gl)
return YES;
}
- (BOOL)makeCurrentWithGL:(EAGLContext **)previousEaglContext withGL:(vlc_gl_t *)gl
- (BOOL)makeCurrent:(EAGLContext **)previousEaglContext withGL:(vlc_gl_t *)gl
{
vlc_mutex_lock(&_mutex);
assert(!_gl_attached);