Commit 91953b8c authored by Steve Lhomme's avatar Steve Lhomme
Browse files

display: remove the unused vararg from the control callback

parent 6c1771b4
......@@ -296,7 +296,7 @@ struct vlc_display_operations
*
* See \ref vout_display_query for the list of request types.
*/
int (*control)(vout_display_t *, int query, va_list);
int (*control)(vout_display_t *, int query);
/**
* Reset the picture format handled by the module.
......
......@@ -703,11 +703,10 @@ static int vd_reset_pictures(vout_display_t *vd, video_format_t *fmt)
return VLC_SUCCESS;
}
static int vd_control(vout_display_t *vd, int query, va_list args)
static int vd_control(vout_display_t *vd, int query)
{
vout_display_sys_t * const sys = vd->sys;
int ret = VLC_EGENERIC;
VLC_UNUSED(args);
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -249,7 +249,7 @@ static int ResetPictures(vout_display_t *vd, video_format_t *fmt)
return VLC_SUCCESS;
}
static int Control(vout_display_t *vd, int query, va_list ap)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -76,7 +76,7 @@ static const vlc_fourcc_t subpicture_chromas[] =
static void Prepare(vout_display_t *, picture_t *, subpicture_t *, vlc_tick_t);
static void Display(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
typedef struct
{
......@@ -896,7 +896,7 @@ static void CopySourceAspect(video_format_t *p_dest,
p_dest->i_sar_den = p_src->i_sar_den;
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......@@ -924,11 +924,11 @@ static int Control(vout_display_t *vd, int query, va_list args)
FixSubtitleFormat(sys);
return VLC_SUCCESS;
}
default:
msg_Warn(vd, "Unknown request in android-display: %d", query);
return VLC_EGENERIC;
case VOUT_DISPLAY_CHANGE_ZOOM:
case VOUT_DISPLAY_CHANGE_DISPLAY_FILLED:
return VLC_SUCCESS;
default:
msg_Warn(vd, "Unknown request in android-display: %d", query);
return VLC_EGENERIC;
}
}
......@@ -171,12 +171,10 @@ static void PictureDisplay(vout_display_t *vd, picture_t *picture)
/**
* Control for vout display
*/
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
(void) args;
switch (query) {
case VOUT_DISPLAY_CHANGE_SOURCE_CROP:
if (sys->dither)
......
......@@ -66,7 +66,7 @@ vlc_module_end()
static void PictureRender (vout_display_t *vd, picture_t *pic, subpicture_t *subpicture,
vlc_tick_t date);
static void PictureDisplay (vout_display_t *vd, picture_t *pic);
static int Control (vout_display_t *vd, int query, va_list ap);
static int Control (vout_display_t *vd, int);
static void *OurGetProcAddress (vlc_gl_t *gl, const char *name);
static int OpenglLock (vlc_gl_t *gl);
......@@ -310,7 +310,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic)
}
}
static int Control (vout_display_t *vd, int query, va_list ap)
static int Control (vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -753,9 +753,9 @@ end:
pDLVideoFrame->Release();
}
static int ControlVideo(vout_display_t *vd, int query, va_list args)
static int ControlVideo(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -94,7 +94,7 @@ vlc_module_end ()
* Local prototypes
*****************************************************************************/
static void Display(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
/* */
static int OpenDisplay (vout_display_t *, bool force_resolution);
......@@ -345,9 +345,9 @@ static void Display(vout_display_t *vd, picture_t *picture)
picture_Copy(sys->picture, picture);
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -79,7 +79,7 @@ struct vout_display_sys_t {
int fd;
};
static void Display(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
static const struct vlc_display_operations ops = {
Close, NULL, Display, Control, NULL, NULL,
......@@ -210,10 +210,8 @@ static void Display(vout_display_t *vd, picture_t *picture)
/**
* Control for vout display
*/
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
VLC_UNUSED(args);
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
case VOUT_DISPLAY_CHANGE_ZOOM:
......
......@@ -58,7 +58,7 @@ static void Close(vout_display_t *vd);
static void PictureRender(vout_display_t *, picture_t *, subpicture_t *, vlc_tick_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);
static void *OurGetProcAddress(vlc_gl_t *, const char *);
......@@ -262,7 +262,7 @@ static void Close(vout_display_t *vd)
* vout display callbacks
*****************************************************************************/
static int Control(vout_display_t *vd, int query, va_list ap)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
struct gl_sys *glsys = sys->gl->sys;
......
......@@ -598,9 +598,9 @@ err_out:
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -110,7 +110,7 @@ struct vout_display_sys_t
* Local prototypes
*****************************************************************************/
static void Display(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
static int OpenDisplay ( vout_display_t *, video_format_t * );
static void CloseDisplay( vout_display_t * );
......@@ -392,9 +392,8 @@ static void Display( vout_display_t *vd, picture_t *picture )
/*****************************************************************************
* Control: control facility for the vout
*****************************************************************************/
static int Control( vout_display_t *vd, int query, va_list args )
static int Control( vout_display_t *vd, int query )
{
VLC_UNUSED(args);
vout_display_sys_t *sys = vd->sys;
switch (query)
......
......@@ -346,7 +346,7 @@ static void PictureDisplay (vout_display_t *vd, picture_t *pic)
sys->has_first_frame = true;
}
static int Control (vout_display_t *vd, int query, va_list ap)
static int Control (vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -85,7 +85,7 @@ struct vout_display_sys_t
/* Display callbacks */
static void PictureRender (vout_display_t *, picture_t *, subpicture_t *, vlc_tick_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);
static int SetViewpoint(vout_display_t *vd, const vlc_viewpoint_t *vp)
{
......@@ -229,7 +229,7 @@ FlipVerticalAlign(vout_display_cfg_t *cfg)
cfg->align.vertical = VLC_VIDEO_ALIGN_TOP;
}
static int Control (vout_display_t *vd, int query, va_list ap)
static int Control (vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -93,9 +93,9 @@ static void vlc_vidsplit_Display(vout_display_t *vd, picture_t *picture)
(void) picture;
}
static int vlc_vidsplit_Control(vout_display_t *vd, int query, va_list args)
static int vlc_vidsplit_Control(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -64,7 +64,7 @@ vlc_module_end ()
* Local prototypes
*****************************************************************************/
static void DisplayStat(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
/*****************************************************************************
* OpenVideo: activates dummy vout display method
......@@ -125,9 +125,9 @@ static void DisplayStat(vout_display_t *vd, picture_t *picture)
}
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -103,7 +103,7 @@ typedef unsigned (*vlc_format_cb)(void **, char *, unsigned *, unsigned *,
static void Prepare(vout_display_t *, picture_t *, subpicture_t *, vlc_tick_t);
static void Display(vout_display_t *, picture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
static const struct vlc_display_operations ops = {
Close, Prepare, Display, Control, NULL, NULL,
......@@ -272,9 +272,9 @@ static void Display(vout_display_t *vd, picture_t *pic)
sys->display(sys->opaque, sys->pic_opaque);
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
(void) vd; (void) args;
(void) vd;
switch (query) {
case VOUT_DISPLAY_CHANGE_DISPLAY_SIZE:
......
......@@ -73,7 +73,7 @@ struct vout_display_sys_t
// Display callbacks
static void PictureRender(vout_display_t *, picture_t *, subpicture_t *, mtime_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);
static void Close(vout_display_t *);
static void UpdateParams(vout_display_t *);
......@@ -334,7 +334,7 @@ static void PictureDisplay(vout_display_t *vd, picture_t *pic)
pl_swapchain_swap_buffers(sys->vk->swapchain);
}
static int Control(vout_display_t *vd, int query, va_list ap)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -175,7 +175,7 @@ static int ResetPictures(vout_display_t *vd, video_format_t *fmt)
return VLC_SUCCESS;
}
static int Control(vout_display_t *vd, int query, va_list ap)
static int Control(vout_display_t *vd, int query)
{
vout_display_sys_t *sys = vd->sys;
......
......@@ -141,7 +141,7 @@ static void Direct3D11DestroyResources(vout_display_t *);
static void Direct3D11DeleteRegions(int, picture_t **);
static int Direct3D11MapSubpicture(vout_display_t *, int *, picture_t ***, subpicture_t *);
static int Control(vout_display_t *, int, va_list);
static int Control(vout_display_t *, int);
static int UpdateDisplayFormat(vout_display_t *vd, const video_format_t *fmt)
......@@ -414,9 +414,8 @@ static void Close(vout_display_t *vd)
CommonWindowClean(&vd->sys->sys);
#endif
}
static int Control(vout_display_t *vd, int query, va_list args)
static int Control(vout_display_t *vd, int query)
{
VLC_UNUSED(args);
vout_display_sys_t *sys = vd->sys;
int res = CommonControl( vd, &sys->area, &sys->sys, query );
......
Supports Markdown
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