[vlc-commits] vout/ios: Rename confusingly named methods
Marvin Scholz
git at videolan.org
Wed Jan 23 19:56:54 CET 2019
vlc/vlc-3.0 | branch: master | Marvin Scholz <epirat07 at gmail.com> | Fri Jan 18 18:52:38 2019 +0100| [8e778cd04e5cbbaa03eebb2e6d254ca6f2bb7c08] | committer: Felix Paul Kühne
vout/ios: Rename confusingly named methods
Signed-off-by: Thomas Guillem <thomas at gllm.fr>
(cherry picked from commit 565d3e9c8e8c4b591a897d1b15fcd30bb75dabd7)
> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=8e778cd04e5cbbaa03eebb2e6d254ca6f2bb7c08
---
modules/video_output/ios.m | 12 ++++++------
1 file changed, 6 insertions(+), 6 deletions(-)
diff --git a/modules/video_output/ios.m b/modules/video_output/ios.m
index f4af41beb5..12d0985fb9 100644
--- a/modules/video_output/ios.m
+++ b/modules/video_output/ios.m
@@ -111,9 +111,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;
@@ -351,7 +351,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;
}
@@ -385,10 +385,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))
@@ -597,7 +597,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);
More information about the vlc-commits
mailing list