From 9920d6465068cdef068eddba4cf51e75d89b65ba Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Mon, 8 Aug 2011 05:59:23 +0300 Subject: cleanup: move global ass_force_reload to struct osd_state --- sub/ass_mp.c | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) (limited to 'sub/ass_mp.c') diff --git a/sub/ass_mp.c b/sub/ass_mp.c index 9a7b89a1ed..94c17b83f0 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -316,16 +316,13 @@ ASS_Library *mp_ass_init(void) return priv; } -int ass_force_reload = 0; // flag set if global ass-related settings were changed - -ASS_Image *mp_ass_render_frame(ASS_Renderer *priv, ASS_Track *track, - long long now, int *detect_change) +void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts, + bool *need_reload) { - if (ass_force_reload) { - ass_set_margins(priv, ass_top_margin, ass_bottom_margin, 0, 0); - ass_set_use_margins(priv, ass_use_margins); - ass_set_font_scale(priv, ass_font_scale); - ass_force_reload = 0; - } - return ass_render_frame(priv, track, now, detect_change); + if (!*need_reload) + return; + ass_set_margins(priv, ass_top_margin, ass_bottom_margin, 0, 0); + ass_set_use_margins(priv, ass_use_margins); + ass_set_font_scale(priv, ass_font_scale); + *need_reload = false; } -- cgit v1.2.3