diff options
Diffstat (limited to 'libvo')
-rw-r--r-- | libvo/vo_direct3d.c | 8 | ||||
-rw-r--r-- | libvo/vo_gl.c | 9 | ||||
-rw-r--r-- | libvo/vo_gl3.c | 8 | ||||
-rw-r--r-- | libvo/vo_vdpau.c | 8 |
4 files changed, 4 insertions, 29 deletions
diff --git a/libvo/vo_direct3d.c b/libvo/vo_direct3d.c index fb2f58f5cc..872fdd376d 100644 --- a/libvo/vo_direct3d.c +++ b/libvo/vo_direct3d.c @@ -40,7 +40,6 @@ #include "aspect.h" #include "w32_common.h" #include "libavutil/common.h" -#include "sub/font_load.h" #include "sub/sub.h" #include "eosd_packer.h" @@ -893,12 +892,7 @@ static bool resize_d3d(d3d_priv *priv) calc_fs_rect(priv); -#ifdef CONFIG_FREETYPE - // font needs to be adjusted - force_load_font = 1; -#endif - // OSD needs to be drawn fresh for new size - vo_osd_changed(OSDTYPE_OSD); + vo_osd_resized(); priv->vo->want_redraw = true; diff --git a/libvo/vo_gl.c b/libvo/vo_gl.c index f44404b2be..1a1336de9c 100644 --- a/libvo/vo_gl.c +++ b/libvo/vo_gl.c @@ -36,7 +36,6 @@ #include "libmpcodecs/mp_image.h" #include "geometry.h" #include "osd.h" -#include "sub/font_load.h" #include "sub/sub.h" #include "eosd_packer.h" @@ -171,13 +170,7 @@ static void resize(struct vo *vo, int x, int y) gl->MatrixMode(GL_MODELVIEW); gl->LoadIdentity(); - if (!p->scaled_osd) { -#ifdef CONFIG_FREETYPE - // adjust font size to display size - force_load_font = 1; -#endif - vo_osd_changed(OSDTYPE_OSD); - } + 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 d1b0540761..6a3f427ef9 100644 --- a/libvo/vo_gl3.c +++ b/libvo/vo_gl3.c @@ -45,7 +45,6 @@ #include "libmpcodecs/mp_image.h" #include "geometry.h" #include "osd.h" -#include "sub/font_load.h" #include "sub/sub.h" #include "eosd_packer.h" @@ -1186,12 +1185,7 @@ static void resize(struct gl_priv *p) update_window_sized_objects(p); update_all_uniforms(p); -#ifdef CONFIG_FREETYPE - // adjust font size to display size - force_load_font = 1; -#endif - vo_osd_changed(OSDTYPE_OSD); - + 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 9343dea3e1..65c371f237 100644 --- a/libvo/vo_vdpau.c +++ b/libvo/vo_vdpau.c @@ -50,8 +50,6 @@ #include "libavcodec/vdpau.h" -#include "sub/font_load.h" - #include "libavutil/common.h" #include "libavutil/mathematics.h" @@ -384,11 +382,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; -#ifdef CONFIG_FREETYPE - // adjust font size to display size - force_load_font = 1; -#endif - vo_osd_changed(OSDTYPE_OSD); + 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.; |