[vlc-commits] commit: Removed useless empty vout_display_t:: manage functions in some modules. (Laurent Aimar )

[git at videolan.org]

vlc | branch: master | Laurent Aimar <fenrir at videolan.org> | Sun Dec 12 17:23:36 2010 +0100| [b6cb15100ef821c34dd5de4f28d9c6ff50c87f21] | committer: Laurent Aimar 

Removed useless empty vout_display_t::manage functions in some modules.

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

 modules/video_output/egl.c      |    8 +-------
 modules/video_output/fb.c       |   21 +--------------------
 modules/video_output/snapshot.c |    8 +-------
 modules/video_output/vmem.c     |    7 +------
 modules/video_output/yuv.c      |    7 +------
 5 files changed, 5 insertions(+), 46 deletions(-)

diff --git a/modules/video_output/egl.c b/modules/video_output/egl.c
index 0fa293a..1d24726 100644
--- a/modules/video_output/egl.c
+++ b/modules/video_output/egl.c
@@ -85,7 +85,6 @@ static picture_pool_t *Pool (vout_display_t *, unsigned);
 static void PictureRender (vout_display_t *, picture_t *);
 static void PictureDisplay (vout_display_t *, picture_t *);
 static int Control (vout_display_t *, int, va_list);
-static void Manage (vout_display_t *);
 /* OpenGL callbacks */
 static void SwapBuffers (vout_opengl_t *gl);
 
@@ -270,7 +269,7 @@ static int Open (vlc_object_t *obj)
     vd->prepare = PictureRender;
     vd->display = PictureDisplay;
     vd->control = Control;
-    vd->manage = Manage;
+    vd->manage = NULL;
 
     return VLC_SUCCESS;
 error:
@@ -413,8 +412,3 @@ static int Control (vout_display_t *vd, int query, va_list ap)
     return VLC_EGENERIC;
 }
 
-static void Manage (vout_display_t *vd)
-{
-    //vout_display_sys_t *sys = vd->sys;
-    (void) vd;
-}
diff --git a/modules/video_output/fb.c b/modules/video_output/fb.c
index 66ac404..4c4cef1 100644
--- a/modules/video_output/fb.c
+++ b/modules/video_output/fb.c
@@ -103,7 +103,6 @@ vlc_module_end ()
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 /* */
 static int  OpenDisplay  (vout_display_t *, bool force_resolution);
@@ -311,7 +310,7 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
+    vd->manage  = NULL;
 
     /* */
     vout_display_SendEventFullscreen(vd, true);
@@ -410,24 +409,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_EGENERIC;
     }
 }
-static void Manage (vout_display_t *vd)
-{
-    VLC_UNUSED(vd);
-#if 0
-    /*
-     * Size change
-     */
-    if (vd->i_changes & VOUT_SIZE_CHANGE)
-    {
-        msg_Dbg(vd, "reinitializing framebuffer screen");
-        vd->i_changes &= ~VOUT_SIZE_CHANGE;
-
-        vout_display_SendEventDisplaySize();
-
-        ClearScreen(vd->sys);
-    }
-#endif
-}
 
 /* following functions are local */
 static int TtyInit(vout_display_t *vd)
diff --git a/modules/video_output/snapshot.c b/modules/video_output/snapshot.c
index c9283aa..bcaee3b 100644
--- a/modules/video_output/snapshot.c
+++ b/modules/video_output/snapshot.c
@@ -93,7 +93,6 @@ vlc_module_end ()
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 typedef struct {
   mtime_t date;         /* Presentation time */
@@ -247,7 +246,7 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
+    vd->manage  = NULL;
 
     /* */
     vout_display_SendEventFullscreen(vd, false);
@@ -334,8 +333,3 @@ static int Control(vout_display_t *vd, int query, va_list args)
     }
 }
 
-static void Manage (vout_display_t *vd)
-{
-    VLC_UNUSED(vd);
-}
-
diff --git a/modules/video_output/vmem.c b/modules/video_output/vmem.c
index 340c55d..ede49a4 100644
--- a/modules/video_output/vmem.c
+++ b/modules/video_output/vmem.c
@@ -107,7 +107,6 @@ typedef unsigned (*vlc_format_cb)(void **, char *, unsigned *, unsigned *,
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 static int            Lock(picture_t *);
 static void           Unlock(picture_t *);
@@ -221,7 +220,7 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
+    vd->manage  = NULL;
 
     /* */
     vout_display_SendEventFullscreen(vd, false);
@@ -324,10 +323,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_EGENERIC;
     }
 }
-static void Manage(vout_display_t *vd)
-{
-    VLC_UNUSED(vd);
-}
 
 /* */
 static int Lock(picture_t *picture)
diff --git a/modules/video_output/yuv.c b/modules/video_output/yuv.c
index 7868ded..7dc4526 100644
--- a/modules/video_output/yuv.c
+++ b/modules/video_output/yuv.c
@@ -83,7 +83,6 @@ static const char *const ppsz_vout_options[] = {
 static picture_pool_t *Pool  (vout_display_t *, unsigned);
 static void           Display(vout_display_t *, picture_t *, subpicture_t *subpicture);
 static int            Control(vout_display_t *, int, va_list);
-static void           Manage (vout_display_t *);
 
 /*****************************************************************************
  * vout_display_sys_t: video output descriptor
@@ -168,7 +167,7 @@ static int Open(vlc_object_t *object)
     vd->prepare = NULL;
     vd->display = Display;
     vd->control = Control;
-    vd->manage  = Manage;
+    vd->manage  = NULL;
 
     vout_display_SendEventFullscreen(vd, false);
     return VLC_SUCCESS;
@@ -277,8 +276,4 @@ static int Control(vout_display_t *vd, int query, va_list args)
         return VLC_EGENERIC;
     }
 }
-static void Manage (vout_display_t *vd)
-{
-    VLC_UNUSED(vd);
-}