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.
This commit is contained in:
wm4
2012-10-04 17:16:36 +02:00
parent 17f5019b46
commit 05f4f00e24
7 changed files with 36 additions and 40 deletions

View File

@@ -2,6 +2,7 @@
#define MPLAYER_SD_H
struct osd_state;
struct sub_render_params;
struct sh_sub;
struct sub_bitmaps;
@@ -10,6 +11,7 @@ struct sd_functions {
void (*decode)(struct sh_sub *sh, struct osd_state *osd,
void *data, int data_len, double pts, double duration);
void (*get_bitmaps)(struct sh_sub *sh, struct osd_state *osd,
struct sub_render_params *params,
struct sub_bitmaps *res);
void (*reset)(struct sh_sub *sh, struct osd_state *osd);
void (*switch_off)(struct sh_sub *sh, struct osd_state *osd);