Commit e83fa9c2 authored by Rémi Denis-Courmont's avatar Rémi Denis-Courmont

vout: remove no longer used VOUT_DISPLAY_GET_OPENGL

parent bc9b4ca6
...@@ -170,9 +170,6 @@ enum { ...@@ -170,9 +170,6 @@ enum {
* The cropping requested is stored by video_format_t::i_x/y_offset and * The cropping requested is stored by video_format_t::i_x/y_offset and
* video_format_t::i_visible_width/height */ * video_format_t::i_visible_width/height */
VOUT_DISPLAY_CHANGE_SOURCE_CROP, /* const video_format_t *p_source */ VOUT_DISPLAY_CHANGE_SOURCE_CROP, /* const video_format_t *p_source */
/* Ask an opengl interface if available. */
VOUT_DISPLAY_GET_OPENGL, /* vlc_gl_t ** */
}; };
/** /**
......
...@@ -92,8 +92,5 @@ VLC_API void vout_SetDisplayZoom(vout_display_t *, unsigned num, unsigned den); ...@@ -92,8 +92,5 @@ VLC_API void vout_SetDisplayZoom(vout_display_t *, unsigned num, unsigned den);
VLC_API void vout_SetDisplayAspect(vout_display_t *, unsigned dar_num, unsigned dar_den); VLC_API void vout_SetDisplayAspect(vout_display_t *, unsigned dar_num, unsigned dar_den);
VLC_API void vout_SetDisplayCrop(vout_display_t *, unsigned crop_num, unsigned crop_den, unsigned left, unsigned top, int right, int bottom); VLC_API void vout_SetDisplayCrop(vout_display_t *, unsigned crop_num, unsigned crop_den, unsigned left, unsigned top, int right, int bottom);
struct vlc_gl_t;
VLC_API struct vlc_gl_t * vout_GetDisplayOpengl(vout_display_t *);
#endif /* VLC_VOUT_WRAPPER_H */ #endif /* VLC_VOUT_WRAPPER_H */
...@@ -267,15 +267,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -267,15 +267,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
vlc_gl_ReleaseCurrent (sys->gl); vlc_gl_ReleaseCurrent (sys->gl);
return VLC_SUCCESS; return VLC_SUCCESS;
} }
#if !USE_OPENGL_ES
case VOUT_DISPLAY_GET_OPENGL:
{
vlc_gl_t **pgl = va_arg (ap, vlc_gl_t **);
*pgl = sys->gl;
return VLC_SUCCESS;
}
#endif
default: default:
msg_Err (vd, "Unknown request %d", query); msg_Err (vd, "Unknown request %d", query);
} }
......
...@@ -63,7 +63,6 @@ vlc_module_end() ...@@ -63,7 +63,6 @@ vlc_module_end()
static picture_pool_t *Pool (vout_display_t *, unsigned); static picture_pool_t *Pool (vout_display_t *, unsigned);
static void Prepare(vout_display_t *, picture_t *, subpicture_t *); static void Prepare(vout_display_t *, picture_t *, subpicture_t *);
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 void Manage (vout_display_t *); static void Manage (vout_display_t *);
static void Swap (vlc_gl_t *); static void Swap (vlc_gl_t *);
...@@ -230,7 +229,7 @@ static int Open(vlc_object_t *object) ...@@ -230,7 +229,7 @@ static int Open(vlc_object_t *object)
vd->pool = Pool; vd->pool = Pool;
vd->prepare = Prepare; vd->prepare = Prepare;
vd->display = Display; vd->display = Display;
vd->control = Control; vd->control = CommonControl;
vd->manage = Manage; vd->manage = Manage;
return VLC_SUCCESS; return VLC_SUCCESS;
...@@ -294,21 +293,6 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic ...@@ -294,21 +293,6 @@ static void Display(vout_display_t *vd, picture_t *picture, subpicture_t *subpic
CommonDisplay(vd); CommonDisplay(vd);
} }
static int Control(vout_display_t *vd, int query, va_list args)
{
switch (query) {
case VOUT_DISPLAY_GET_OPENGL: {
vlc_gl_t **gl = va_arg(args, vlc_gl_t **);
*gl = &vd->sys->gl;
CommonDisplay(vd);
return VLC_SUCCESS;
}
default:
return CommonControl(vd, query, args);
}
}
static void Manage (vout_display_t *vd) static void Manage (vout_display_t *vd)
{ {
vout_display_sys_t *sys = vd->sys; vout_display_sys_t *sys = vd->sys;
......
...@@ -247,13 +247,6 @@ static int Control (vout_display_t *vd, int query, va_list ap) ...@@ -247,13 +247,6 @@ static int Control (vout_display_t *vd, int query, va_list ap)
xcb_flush (sys->conn); xcb_flush (sys->conn);
return VLC_SUCCESS; return VLC_SUCCESS;
case VOUT_DISPLAY_GET_OPENGL:
{
vlc_gl_t **gl = va_arg (ap, vlc_gl_t **);
*gl = sys->gl;
return VLC_SUCCESS;
}
case VOUT_DISPLAY_RESET_PICTURES: case VOUT_DISPLAY_RESET_PICTURES:
assert (0); assert (0);
default: default:
......
...@@ -637,7 +637,6 @@ vout_AreDisplayPicturesInvalid ...@@ -637,7 +637,6 @@ vout_AreDisplayPicturesInvalid
vout_IsDisplayFiltered vout_IsDisplayFiltered
vout_FilterDisplay vout_FilterDisplay
vout_ManageDisplay vout_ManageDisplay
vout_GetDisplayOpengl
vout_SetDisplayFullscreen vout_SetDisplayFullscreen
vout_SetDisplayFilled vout_SetDisplayFilled
vout_SetDisplayZoom vout_SetDisplayZoom
......
...@@ -1270,14 +1270,6 @@ void vout_SetDisplayCrop(vout_display_t *vd, ...@@ -1270,14 +1270,6 @@ void vout_SetDisplayCrop(vout_display_t *vd,
} }
} }
struct vlc_gl_t *vout_GetDisplayOpengl(vout_display_t *vd)
{
struct vlc_gl_t *gl;
if (vout_display_Control(vd, VOUT_DISPLAY_GET_OPENGL, &gl))
return NULL;
return gl;
}
static vout_display_t *DisplayNew(vout_thread_t *vout, static vout_display_t *DisplayNew(vout_thread_t *vout,
const video_format_t *source, const video_format_t *source,
const vout_display_state_t *state, const vout_display_state_t *state,
......
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