From 34b3a9c5e97dfae87afab64915dec624439eafa6 Mon Sep 17 00:00:00 2001
From: wm4 <wm4@nowhere>
Date: Thu, 4 Oct 2012 17:16:28 +0200
Subject: sub, VO: remove vo_osd_resized() function

VOs which could render the OSD in window size (as opposed to video size,
like vo_xv) and which could cache the OSD called this when the window
size changed. This was needed, because VOs used another OSD function to
check whether the OSD changed before passing the new window size to the
OSD code.

This was really just an artifact of OSD change detection, and now that
the affected VOs use the new OSD rendering API, it's done automatically.
---
 libvo/vo_corevideo.m | 2 --
 libvo/vo_direct3d.c  | 2 --
 libvo/vo_gl.c        | 1 -
 libvo/vo_gl3.c       | 1 -
 libvo/vo_vdpau.c     | 2 +-
 5 files changed, 1 insertion(+), 7 deletions(-)

(limited to 'libvo')

diff --git a/libvo/vo_corevideo.m b/libvo/vo_corevideo.m
index 1ac6369089..37a16fec5e 100644
--- a/libvo/vo_corevideo.m
+++ b/libvo/vo_corevideo.m
@@ -91,8 +91,6 @@ static void resize(struct vo *vo, int width, int height)
     gl->MatrixMode(GL_MODELVIEW);
     gl->LoadIdentity();
 
-    vo_osd_resized();
-
     gl->Clear(GL_COLOR_BUFFER_BIT);
     vo->want_redraw = true;
 }
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c
index a9bac67e6c..4f16c6a6b1 100644
--- a/libvo/vo_direct3d.c
+++ b/libvo/vo_direct3d.c
@@ -850,8 +850,6 @@ static bool resize_d3d(d3d_priv *priv)
 
     calc_fs_rect(priv);
 
-    vo_osd_resized();
-
     priv->vo->want_redraw = true;
 
     return 1;
diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c
index 1608ea594e..7ad5fe31e3 100644
--- a/libvo/vo_gl.c
+++ b/libvo/vo_gl.c
@@ -145,7 +145,6 @@ static void resize(struct vo *vo, int x, int y)
     gl->MatrixMode(GL_MODELVIEW);
     gl->LoadIdentity();
 
-    vo_osd_resized();
     gl->Clear(GL_COLOR_BUFFER_BIT);
     vo->want_redraw = true;
 }
diff --git a/libvo/vo_gl3.c b/libvo/vo_gl3.c
index 934d8f394d..66324281ba 100644
--- a/libvo/vo_gl3.c
+++ b/libvo/vo_gl3.c
@@ -1210,7 +1210,6 @@ static void resize(struct gl_priv *p)
     update_window_sized_objects(p);
     update_all_uniforms(p);
 
-    vo_osd_resized();
     gl->Clear(GL_COLOR_BUFFER_BIT);
     vo->want_redraw = true;
 }
diff --git a/libvo/vo_vdpau.c b/libvo/vo_vdpau.c
index 64378a9a0c..1e587810ac 100644
--- a/libvo/vo_vdpau.c
+++ b/libvo/vo_vdpau.c
@@ -385,7 +385,7 @@ static void resize(struct vo *vo)
     vc->src_rect_vid.y1 = vc->flip ? src_rect.top    : src_rect.bottom;
     vc->border_x        = borders.left;
     vc->border_y        = borders.top;
-    vo_osd_resized();
+
     int flip_offset_ms = vo_fs ? vc->flip_offset_fs : vc->flip_offset_window;
     vo->flip_queue_offset = flip_offset_ms / 1000.;
 
-- 
cgit v1.2.3