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.

1 files changed, 7 insertions, 12 deletions

diff --git a/sub/sub.c b/sub/sub.c
index 64dba7df20..600ef6fae1 100644
--- a/sub/sub.c
+++ b/sub/sub.c
@@ -178,18 +178,13 @@ static bool render_object(struct osd_state *osd, struct osd_object *obj,
             out_imgs->bitmap_pos_id++;
         }
     } else if (obj->type == OSDTYPE_SUB) {
-        double pts = sub_params->pts;
-        if (pts != MP_NOPTS_VALUE)
-            pts += sub_delay - osd->sub_offset;
-
-        // passing the parameters is a big temporary hack
-        osd->sub_pts = pts;
-        osd->dim = sub_params->dim;
-        osd->normal_scale = sub_params->normal_scale;
-        osd->vsfilter_scale = sub_params->vsfilter_scale;
-        osd->support_rgba = formats[SUBBITMAP_RGBA];
-
-        sub_get_bitmaps(osd, out_imgs);
+        struct sub_render_params p = *sub_params;
+        if (p.pts != MP_NOPTS_VALUE)
+            p.pts += sub_delay - osd->sub_offset;
+
+        p.support_rgba = formats[SUBBITMAP_RGBA];
+
+        sub_get_bitmaps(osd, &p, out_imgs);
     } else {
         osd_object_get_bitmaps(osd, obj, out_imgs);
     }