From 152a2024cf271377005897974a2b0dc58a4dffa5 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sat, 2 Mar 2013 15:10:59 +0100 Subject: video/out: remove VO_EVENT_REINIT It was once used for vo_sdl (the old one based on SDL 1.2), since SDL apparently lost the GL state when switching to fullscreen. The new vo_sdl (using SDL 1.3) doesn't use or need this. It's dead code, so get rid of it. --- video/out/vo.h | 1 - video/out/vo_opengl.c | 6 ------ video/out/vo_opengl_old.c | 4 ---- 3 files changed, 11 deletions(-) (limited to 'video') diff --git a/video/out/vo.h b/video/out/vo.h index ea0189dcee..ae5c105597 100644 --- a/video/out/vo.h +++ b/video/out/vo.h @@ -32,7 +32,6 @@ #define VO_EVENT_EXPOSE 1 #define VO_EVENT_RESIZE 2 #define VO_EVENT_KEYPRESS 4 -#define VO_EVENT_REINIT 8 #define VO_EVENT_MOVE 16 enum mp_voctrl { diff --git a/video/out/vo_opengl.c b/video/out/vo_opengl.c index aa3c3cea0a..baaad18381 100644 --- a/video/out/vo_opengl.c +++ b/video/out/vo_opengl.c @@ -1672,12 +1672,6 @@ static void check_events(struct vo *vo) struct gl_priv *p = vo->priv; int e = p->glctx->check_events(vo); - if (e & VO_EVENT_REINIT) { - uninit_gl(p); - init_gl(p); - init_video(p); - resize(p); - } if (e & VO_EVENT_RESIZE) resize(p); if (e & VO_EVENT_EXPOSE) diff --git a/video/out/vo_opengl_old.c b/video/out/vo_opengl_old.c index 0f286dc72a..96472d02f2 100644 --- a/video/out/vo_opengl_old.c +++ b/video/out/vo_opengl_old.c @@ -1771,10 +1771,6 @@ static void check_events(struct vo *vo) struct gl_priv *p = vo->priv; int e = p->glctx->check_events(vo); - if (e & VO_EVENT_REINIT) { - uninitGl(vo); - initGl(vo, vo->dwidth, vo->dheight); - } if (e & VO_EVENT_RESIZE) resize(vo, vo->dwidth, vo->dheight); if (e & VO_EVENT_EXPOSE) -- cgit v1.2.3