From 7177ef3e1ca1a6a5c359f6bc1431ff0d6d761d61 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 8 Sep 2016 18:59:21 +0200 Subject: [PATCH] vo: remove unused VOCTRL_GET_PANSCAN It was used to determine whether the VO supports VOCTRL_SET_PANSCAN. With all those changes to property semantics this became unnecessary, and its only use was dropped at some point. --- video/out/vo.h | 1 - video/out/vo_direct3d.c | 2 -- video/out/vo_drm.c | 2 -- video/out/vo_opengl.c | 2 -- video/out/vo_opengl_cb.c | 2 -- video/out/vo_rpi.c | 2 -- video/out/vo_sdl.c | 2 -- video/out/vo_vaapi.c | 2 -- video/out/vo_vdpau.c | 2 -- video/out/vo_wayland.c | 5 +---- video/out/vo_x11.c | 2 -- video/out/vo_xv.c | 2 -- 12 files changed, 1 insertion(+), 25 deletions(-) diff --git a/video/out/vo.h b/video/out/vo.h index e3258a39ff..407255be12 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -56,7 +56,6 @@ enum mp_voctrl { /* start/resume playback */ VOCTRL_RESUME, - VOCTRL_GET_PANSCAN, VOCTRL_SET_PANSCAN, VOCTRL_SET_EQUALIZER, // struct voctrl_set_equalizer_args* VOCTRL_GET_EQUALIZER, // struct voctrl_get_equalizer_args* diff --git a/video/out/vo_direct3d.c b/video/out/vo_direct3d.c index bb3f9461c1..38dde55af2 100644 --- a/video/out/vo_direct3d.c +++ b/video/out/vo_direct3d.c @@ -1280,8 +1280,6 @@ static int control(struct vo *vo, uint32_t request, void *data) calc_fs_rect(priv); priv->vo->want_redraw = true; return VO_TRUE; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SCREENSHOT_WIN: *(struct mp_image **)data = get_window_screenshot(priv); return VO_TRUE; diff --git a/video/out/vo_drm.c b/video/out/vo_drm.c index 6a21eabfcd..6819c98bb4 100644 --- a/video/out/vo_drm.c +++ b/video/out/vo_drm.c @@ -477,8 +477,6 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_REDRAW_FRAME: draw_image(vo, p->last_input); return VO_TRUE; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: if (vo->config_ok) reconfig(vo, vo->params); diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index a22f02bb5e..36645ec0cd 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -279,8 +279,6 @@ static int control(struct vo *vo, uint32_t request, void *data) struct gl_priv *p = vo->priv; switch (request) { - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: resize(p); return VO_TRUE; diff --git a/video/out/vo_opengl_cb.c b/video/out/vo_opengl_cb.c index c2d3be78e6..c94d8b7ce8 100644 --- a/video/out/vo_opengl_cb.c +++ b/video/out/vo_opengl_cb.c @@ -448,8 +448,6 @@ static int control(struct vo *vo, uint32_t request, void *data) vo->want_redraw = true; vo_wakeup(vo); return VO_TRUE; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_GET_EQUALIZER: { struct voctrl_get_equalizer_args *args = data; pthread_mutex_lock(&p->ctx->lock); diff --git a/video/out/vo_rpi.c b/video/out/vo_rpi.c index a0cc0e39ef..9a1280584c 100644 --- a/video/out/vo_rpi.c +++ b/video/out/vo_rpi.c @@ -616,8 +616,6 @@ static int control(struct vo *vo, uint32_t request, void *data) set_geometry(vo); vo->want_redraw = true; return VO_TRUE; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: if (p->renderer_enabled) resize(vo); diff --git a/video/out/vo_sdl.c b/video/out/vo_sdl.c index ef42ac93ba..76f336ffeb 100644 --- a/video/out/vo_sdl.c +++ b/video/out/vo_sdl.c @@ -980,8 +980,6 @@ static int control(struct vo *vo, uint32_t request, void *data) case VOCTRL_REDRAW_FRAME: draw_image(vo, NULL); return 1; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: force_resize(vo); return VO_TRUE; diff --git a/video/out/vo_vaapi.c b/video/out/vo_vaapi.c index b308c8be3c..0b741850b0 100644 --- a/video/out/vo_vaapi.c +++ b/video/out/vo_vaapi.c @@ -545,8 +545,6 @@ static int control(struct vo *vo, uint32_t request, void *data) p->output_surface = p->visible_surface; draw_osd(vo); return true; - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: resize(p); return VO_TRUE; diff --git a/video/out/vo_vdpau.c b/video/out/vo_vdpau.c index 25ab72db80..757c31e32f 100644 --- a/video/out/vo_vdpau.c +++ b/video/out/vo_vdpau.c @@ -1087,8 +1087,6 @@ static int control(struct vo *vo, uint32_t request, void *data) check_preemption(vo); switch (request) { - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: checked_resize(vo); return VO_TRUE; diff --git a/video/out/vo_wayland.c b/video/out/vo_wayland.c index cdfdc24ad4..6a7b18a6c5 100644 --- a/video/out/vo_wayland.c +++ b/video/out/vo_wayland.c @@ -639,10 +639,7 @@ static int control(struct vo *vo, uint32_t request, void *data) { struct priv *p = vo->priv; switch (request) { - case VOCTRL_GET_PANSCAN: - return VO_TRUE; - case VOCTRL_SET_PANSCAN: - { + case VOCTRL_SET_PANSCAN: { resize(p); return VO_TRUE; } diff --git a/video/out/vo_x11.c b/video/out/vo_x11.c index b06a231e5a..1dfab562b2 100644 --- a/video/out/vo_x11.c +++ b/video/out/vo_x11.c @@ -420,8 +420,6 @@ static int control(struct vo *vo, uint32_t request, void *data) { struct priv *p = vo->priv; switch (request) { - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: if (vo->config_ok) resize(vo); diff --git a/video/out/vo_xv.c b/video/out/vo_xv.c index 0078dc8237..1cc5b0197b 100644 --- a/video/out/vo_xv.c +++ b/video/out/vo_xv.c @@ -870,8 +870,6 @@ static int control(struct vo *vo, uint32_t request, void *data) { struct xvctx *ctx = vo->priv; switch (request) { - case VOCTRL_GET_PANSCAN: - return VO_TRUE; case VOCTRL_SET_PANSCAN: resize(vo); return VO_TRUE;