diff options
| -rw-r--r-- | command.c | 6 | ||||
| -rw-r--r-- | libvo/vo_corevideo.m | 2 | ||||
| -rw-r--r-- | libvo/vo_direct3d.c | 2 | ||||
| -rw-r--r-- | libvo/vo_gl.c | 1 | ||||
| -rw-r--r-- | libvo/vo_gl3.c | 1 | ||||
| -rw-r--r-- | libvo/vo_vdpau.c | 2 | ||||
| -rw-r--r-- | sub/sub.c | 8 | ||||
| -rw-r--r-- | sub/sub.h | 1 |
8 files changed, 5 insertions, 18 deletions
@@ -1598,7 +1598,8 @@ static int mp_property_sub_scale(m_option_t *prop, int action, void *arg, if (opts->ass_enabled) opts->ass_font_scale = *(float *) arg; text_font_scale_factor = *(float *) arg; - vo_osd_resized(); + vo_osd_changed(OSDTYPE_SUBTITLE); + vo_osd_changed(OSDTYPE_OSD); return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: @@ -1610,7 +1611,8 @@ static int mp_property_sub_scale(m_option_t *prop, int action, void *arg, text_font_scale_factor += (arg ? *(float *) arg : 0.1) * (action == M_PROPERTY_STEP_UP ? 1.0 : -1.0); M_PROPERTY_CLAMP(prop, text_font_scale_factor); - vo_osd_resized(); + vo_osd_changed(OSDTYPE_SUBTITLE); + vo_osd_changed(OSDTYPE_OSD); return M_PROPERTY_OK; default: if (opts->ass_enabled) 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.; @@ -301,14 +301,6 @@ void vo_osd_reset_changed(void) osd->objs[n]->force_redraw = false; } -void vo_osd_resized(void) -{ - // Counter the typical vo_osd_has_changed(osd) call in VO's draw_osd() - struct osd_state *osd = global_osd; - for (int n = 0; n < MAX_OSD_PARTS; n++) - osd->objs[n]->force_redraw = true; -} - bool sub_bitmaps_bb(struct sub_bitmaps *imgs, int *x1, int *y1, int *x2, int *y2) { @@ -169,7 +169,6 @@ void osd_update(struct osd_state *osd, int dxs, int dys); void vo_osd_changed(int new_value); void vo_osd_reset_changed(void); bool vo_osd_has_changed(struct osd_state *osd); -void vo_osd_resized(void); void osd_free(struct osd_state *osd); bool sub_bitmaps_bb(struct sub_bitmaps *imgs, int *x1, int *y1, |