From 05f4f00e24caf23646a2b551b8e1a1a1abe76de7 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 4 Oct 2012 17:16:36 +0200 Subject: sub: cleanup: don't pass parameters via global variables Passing parameters from caller to subtitle renderer was done by temporarily setting certain members in the osd_state struct (which for all practical purposes are as good as global variables). This was the only purpose of these members. Rather than using such a messy way to pass parameter, put these into a struct sub_render_params. The struct was already introduced in earlier commits, and this commit just removes the parameter passing hack. --- sub/sub.h | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'sub/sub.h') diff --git a/sub/sub.h b/sub/sub.h index 4f055558e9..ed3010c1af 100644 --- a/sub/sub.h +++ b/sub/sub.h @@ -67,10 +67,6 @@ struct osd_state { double sub_offset; double vo_sub_pts; - double sub_pts; - struct mp_eosd_res dim; - double normal_scale; - double vsfilter_scale; bool support_rgba; bool render_subs_in_filter; @@ -80,9 +76,7 @@ struct osd_state { char *osd_text; // OSDTYPE_OSD int progbar_type, progbar_value; // OSDTYPE_PROGBAR - // temporary for sub decoders - int bitmap_id; - int bitmap_pos_id; + int switch_sub_id; struct MPOpts *opts; -- cgit v1.2.3