summaryrefslogtreecommitdiffstats
path: root/sub/ass_mp.h
diff options
context:
space:
mode:
authorUoti Urpala <uau@mplayer2.org>2011-09-03 13:47:56 +0300
committerUoti Urpala <uau@mplayer2.org>2011-09-03 14:26:14 +0300
commit83fc5b60046b12227540f77969b5c1aa29107bad (patch)
treef72bbea73524a7b9005e3c935fafe1f20bd43991 /sub/ass_mp.h
parent3e0a2705595cbf991e0428984052488ad94c6d21 (diff)
downloadmpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.bz2
mpv-83fc5b60046b12227540f77969b5c1aa29107bad.tar.xz
options: move libass-related options to struct
Diffstat (limited to 'sub/ass_mp.h')
-rw-r--r--sub/ass_mp.h23
1 files changed, 7 insertions, 16 deletions
diff --git a/sub/ass_mp.h b/sub/ass_mp.h
index 5658f4f8c1..a222d61bbb 100644
--- a/sub/ass_mp.h
+++ b/sub/ass_mp.h
@@ -31,26 +31,17 @@
#include <ass/ass.h>
#include <ass/ass_types.h>
-extern float ass_font_scale;
-extern float ass_line_spacing;
-extern int ass_top_margin;
-extern int ass_bottom_margin;
-extern int use_embedded_fonts;
-extern int ass_use_margins;
-extern char *ass_color;
-extern char *ass_border_color;
-extern char *ass_styles_file;
-extern int ass_hinting;
-
-ASS_Track *mp_ass_default_track(ASS_Library *library);
-ASS_Track *mp_ass_read_subdata(ASS_Library *library, sub_data *subdata,
- double fps);
+ASS_Track *mp_ass_default_track(ASS_Library *library, struct MPOpts *opts);
+ASS_Track *mp_ass_read_subdata(ASS_Library *library, struct MPOpts *opts,
+ sub_data *subdata, double fps);
ASS_Track *mp_ass_read_stream(ASS_Library *library, const char *fname,
char *charset);
-void mp_ass_configure(ASS_Renderer *priv, int w, int h, bool unscaled);
+struct MPOpts;
+void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, int w, int h,
+ bool unscaled);
void mp_ass_configure_fonts(ASS_Renderer *priv);
-ASS_Library *mp_ass_init(void);
+ASS_Library *mp_ass_init(struct MPOpts *opts);
void mp_ass_reload_options(ASS_Renderer *priv, struct MPOpts *opts);