Commit b6cb1510 authored by Laurent Aimar's avatar Laurent Aimar

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

parent b0fc931f
...@@ -85,7 +85,6 @@ static picture_pool_t *Pool (vout_display_t *, unsigned); ...@@ -85,7 +85,6 @@ static picture_pool_t *Pool (vout_display_t *, unsigned);
static void PictureRender (vout_display_t *, picture_t *); static void PictureRender (vout_display_t *, picture_t *);
static void PictureDisplay (vout_display_t *, picture_t *); static void PictureDisplay (vout_display_t *, picture_t *);
static int Control (vout_display_t *, int, va_list); static int Control (vout_display_t *, int, va_list);
static void Manage (vout_display_t *);
/* OpenGL callbacks */ /* OpenGL callbacks */
static void SwapBuffers (vout_opengl_t *gl); static void SwapBuffers (vout_opengl_t *gl);
...@@ -270,7 +269,7 @@ static int Open (vlc_object_t *obj) ...@@ -270,7 +269,7 @@ static int Open (vlc_object_t *obj)
vd->prepare = PictureRender; vd->prepare = PictureRender;
vd->display = PictureDisplay; vd->display = PictureDisplay;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = NULL;
return VLC_SUCCESS; return VLC_SUCCESS;
error: error:
...@@ -413,8 +412,3 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -413,8 +412,3 @@ static int Control (vout_display_t *vd, int query, va_list ap)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
static void Manage (vout_display_t *vd)
{
//vout_display_sys_t *sys = vd->sys;
(void) vd;
}
...@@ -103,7 +103,6 @@ vlc_module_end () ...@@ -103,7 +103,6 @@ vlc_module_end ()
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Display(vout_display_t *, picture_t *, subpicture_t *); static void Display(vout_display_t *, picture_t *, subpicture_t *);
static int Control(vout_display_t *, int, va_list); static int Control(vout_display_t *, int, va_list);
static void Manage (vout_display_t *);
/* */ /* */
static int OpenDisplay (vout_display_t *, bool force_resolution); static int OpenDisplay (vout_display_t *, bool force_resolution);
...@@ -311,7 +310,7 @@ static int Open(vlc_object_t *object) ...@@ -311,7 +310,7 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL; vd->prepare = NULL;
vd->display = Display; vd->display = Display;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = NULL;
/* */ /* */
vout_display_SendEventFullscreen(vd, true); vout_display_SendEventFullscreen(vd, true);
...@@ -410,24 +409,6 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -410,24 +409,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC; 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 */ /* following functions are local */
static int TtyInit(vout_display_t *vd) static int TtyInit(vout_display_t *vd)
......
...@@ -93,7 +93,6 @@ vlc_module_end () ...@@ -93,7 +93,6 @@ vlc_module_end ()
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Display(vout_display_t *, picture_t *, subpicture_t *); static void Display(vout_display_t *, picture_t *, subpicture_t *);
static int Control(vout_display_t *, int, va_list); static int Control(vout_display_t *, int, va_list);
static void Manage (vout_display_t *);
typedef struct { typedef struct {
mtime_t date; /* Presentation time */ mtime_t date; /* Presentation time */
...@@ -247,7 +246,7 @@ static int Open(vlc_object_t *object) ...@@ -247,7 +246,7 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL; vd->prepare = NULL;
vd->display = Display; vd->display = Display;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = NULL;
/* */ /* */
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
...@@ -334,8 +333,3 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -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);
}
...@@ -107,7 +107,6 @@ typedef unsigned (*vlc_format_cb)(void **, char *, unsigned *, unsigned *, ...@@ -107,7 +107,6 @@ typedef unsigned (*vlc_format_cb)(void **, char *, unsigned *, unsigned *,
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Display(vout_display_t *, picture_t *, subpicture_t *); static void Display(vout_display_t *, picture_t *, subpicture_t *);
static int Control(vout_display_t *, int, va_list); static int Control(vout_display_t *, int, va_list);
static void Manage (vout_display_t *);
static int Lock(picture_t *); static int Lock(picture_t *);
static void Unlock(picture_t *); static void Unlock(picture_t *);
...@@ -221,7 +220,7 @@ static int Open(vlc_object_t *object) ...@@ -221,7 +220,7 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL; vd->prepare = NULL;
vd->display = Display; vd->display = Display;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = NULL;
/* */ /* */
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
...@@ -324,10 +323,6 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -324,10 +323,6 @@ static int Control(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
static void Manage(vout_display_t *vd)
{
VLC_UNUSED(vd);
}
/* */ /* */
static int Lock(picture_t *picture) static int Lock(picture_t *picture)
......
...@@ -83,7 +83,6 @@ static const char *const ppsz_vout_options[] = { ...@@ -83,7 +83,6 @@ static const char *const ppsz_vout_options[] = {
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Display(vout_display_t *, picture_t *, subpicture_t *subpicture); static void Display(vout_display_t *, picture_t *, subpicture_t *subpicture);
static int Control(vout_display_t *, int, va_list); static int Control(vout_display_t *, int, va_list);
static void Manage (vout_display_t *);
/***************************************************************************** /*****************************************************************************
* vout_display_sys_t: video output descriptor * vout_display_sys_t: video output descriptor
...@@ -168,7 +167,7 @@ static int Open(vlc_object_t *object) ...@@ -168,7 +167,7 @@ static int Open(vlc_object_t *object)
vd->prepare = NULL; vd->prepare = NULL;
vd->display = Display; vd->display = Display;
vd->control = Control; vd->control = Control;
vd->manage = Manage; vd->manage = NULL;
vout_display_SendEventFullscreen(vd, false); vout_display_SendEventFullscreen(vd, false);
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -277,8 +276,4 @@ static int Control(vout_display_t *vd, int query, va_list args) ...@@ -277,8 +276,4 @@ static int Control(vout_display_t *vd, int query, va_list args)
return VLC_EGENERIC; return VLC_EGENERIC;
} }
} }
static void Manage (vout_display_t *vd)
{
VLC_UNUSED(vd);
}
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