[vlc-commits] ios2_vout: minor cleanup

[Felix Paul Kühne]

vlc/vlc-2.1 | branch: master | Felix Paul Kühne <fkuehne at videolan.org> | Sun Jul  7 22:01:25 2013 +0300| [9f724390c8d24982b471872cb16a77fcea937780] | committer: Jean-Baptiste Kempf

ios2_vout: minor cleanup

(cherry picked from commit 2be7fadd26b77207f3d304af183014090aad0e15)
Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

> http://git.videolan.org/gitweb.cgi/vlc/vlc-2.1.git/?a=commit;h=9f724390c8d24982b471872cb16a77fcea937780
---

 modules/video_output/ios2.m |   40 +++++++++++++++-------------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/modules/video_output/ios2.m b/modules/video_output/ios2.m
index 1aa0ce2..28369b4 100644
--- a/modules/video_output/ios2.m
+++ b/modules/video_output/ios2.m
@@ -4,16 +4,13 @@
  * Copyright (C) 2001-2013 VLC authors and VideoLAN
  * $Id$
  *
- * Authors: Derk-Jan Hartman <hartman at videolan dot org>
- *          Eric Petit <titer at m0k.org>
- *          Benjamin Pracht <bigben at videolan dot org>
- *          Damien Fouilleul <damienf at videolan dot org>
- *          Pierre d'Herbemont <pdherbemont at videolan dot org>
+ * Authors: Pierre d'Herbemont <pdherbemont at videolan dot org>
  *          Felix Paul Kühne <fkuehne at videolan dot org>
  *          David Fuhrmann <david dot fuhrmann at googlemail dot com>
  *          Rémi Denis-Courmont
- *          Juho Vähä-Herttua <juhovh at iki dot fi>
  *          Laurent Aimar <fenrir _AT_ videolan _DOT_ org>
+ *          Eric Petit <titer at m0k.org>
+ *
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms of the GNU Lesser General Public License as published by
@@ -54,8 +51,8 @@
 /**
  * Forward declarations
  */
-static int Open (vlc_object_t *);
-static void Close (vlc_object_t *);
+static int Open(vlc_object_t *);
+static void Close(vlc_object_t *);
 
 static picture_pool_t* PicturePool(vout_display_t *vd, unsigned requested_count);
 static void PictureRender(vout_display_t* vd, picture_t *pic, subpicture_t *subpicture);
@@ -71,18 +68,17 @@ static void OpenglESSwap(vlc_gl_t* gl);
  * Module declaration
  */
 vlc_module_begin ()
-    set_shortname ("iOS vout")
-    set_description (N_("iOS OpenGL video output"))
-    set_category (CAT_VIDEO)
-    set_subcategory (SUBCAT_VIDEO_VOUT)
-    set_capability ("vout display", 300)
-    set_callbacks (Open, Close)
-
-    add_shortcut ("vout_ios2")
+    set_shortname("iOS vout")
+    set_description(N_("iOS OpenGL video output"))
+    set_category(CAT_VIDEO)
+    set_subcategory(SUBCAT_VIDEO_VOUT)
+    set_capability("vout display", 300)
+    set_callbacks(Open, Close)
+
+    add_shortcut("vout_ios2")
 vlc_module_end ()
 
- at interface VLCOpenGLES2VideoView : UIView
-{
+ at interface VLCOpenGLES2VideoView : UIView {
     vout_display_t *_voutDisplay;
     EAGLContext *_eaglContext;
     GLuint _renderBuffer;
@@ -98,10 +94,8 @@ vlc_module_end ()
 - (void)createBuffers;
 - (void)destroyBuffers;
 - (void)resetBuffers;
-
 @end
 
-
 struct vout_display_sys_t
 {
     VLCOpenGLES2VideoView *glESView;
@@ -111,13 +105,11 @@ struct vout_display_sys_t
     vout_display_opengl_t *vgl;
 
     picture_pool_t *picturePool;
-    picture_t *current;
     bool has_first_frame;
 
     vout_display_place_t place;
 };
 
-
 static void *OurGetProcAddress(vlc_gl_t *gl, const char *name)
 {
     VLC_UNUSED(gl);
@@ -233,8 +225,7 @@ static int Control(vout_display_t *vd, int query, va_list ap)
 {
     vout_display_sys_t *sys = vd->sys;
 
-    switch (query)
-    {
+    switch (query) {
         case VOUT_DISPLAY_CHANGE_FULLSCREEN:
         case VOUT_DISPLAY_CHANGE_WINDOW_STATE:
         case VOUT_DISPLAY_HIDE_MOUSE:
@@ -326,7 +317,6 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic, subpicture_t *sub
 
 static void PictureRender(vout_display_t *vd, picture_t *pic, subpicture_t *subpicture)
 {
-
     vout_display_sys_t *sys = vd->sys;
 
     if (likely([sys->glESView isAppActive]))