diff options
Diffstat (limited to 'sub')
-rw-r--r-- | sub/draw_bmp.c | 1 | ||||
-rw-r--r-- | sub/find_subfiles.c | 1 | ||||
-rw-r--r-- | sub/sub.c | 10 | ||||
-rw-r--r-- | sub/sub.h | 17 |
4 files changed, 5 insertions, 24 deletions
diff --git a/sub/draw_bmp.c b/sub/draw_bmp.c index 1008b1b23e..d58033fceb 100644 --- a/sub/draw_bmp.c +++ b/sub/draw_bmp.c @@ -18,6 +18,7 @@ #include "sub/draw_bmp.h" +#include <stddef.h> #include <stdbool.h> #include <assert.h> #include <math.h> diff --git a/sub/find_subfiles.c b/sub/find_subfiles.c index b073a722c6..2e705bd4d1 100644 --- a/sub/find_subfiles.c +++ b/sub/find_subfiles.c @@ -12,6 +12,7 @@ #include "mpcommon.h" #include "sub/find_subfiles.h" #include "sub/sub.h" +#include "sub/subreader.h" static struct bstr strip_ext(struct bstr str) { @@ -39,6 +39,7 @@ #include "img_convert.h" #include "draw_bmp.h" #include "spudec.h" +#include "subreader.h" char * const sub_osd_names[]={ @@ -58,21 +59,12 @@ char * const sub_osd_names[]={ }; char * const sub_osd_names_short[] ={ "", "|>", "||", "[]", "<<" , ">>", "", "", "", "", "", "", "" }; -int sub_unicode=0; int sub_utf8=0; int sub_pos=100; -int sub_width_p=100; int sub_visibility=1; -int sub_bg_color=0; /* subtitles background color */ -int sub_bg_alpha=0; -int sub_justify=0; subtitle* vo_sub=NULL; -char *subtitle_font_encoding = NULL; float text_font_scale_factor = 3.5; -float osd_font_scale_factor = 4.0; -float subtitle_font_radius = 2.0; -float subtitle_font_thickness = 2.0; // 0 = no autoscale // 1 = video height // 2 = video width @@ -19,14 +19,10 @@ #ifndef MPLAYER_SUB_H #define MPLAYER_SUB_H +#include <stddef.h> #include <stdbool.h> #include <stdint.h> -#include "subreader.h" - -struct vo; -struct sub_render_params; - // NOTE: VOs must support at least SUBBITMAP_LIBASS and SUBBITMAP_RGBA. enum sub_bitmap_format { SUBBITMAP_EMPTY = 0,// no bitmaps; always has num_parts==0 @@ -145,7 +141,7 @@ struct osd_state { struct ass_library *osd_ass_library; }; -extern subtitle* vo_sub; +extern struct subtitle* vo_sub; extern void* vo_spudec; extern void* vo_vobsub; @@ -180,20 +176,12 @@ enum mp_osd_font_codepoints { extern char * const sub_osd_names[]; extern char * const sub_osd_names_short[]; -extern int sub_unicode; extern int sub_utf8; extern char *sub_cp; extern int sub_pos; -extern int sub_width_p; -extern int sub_bg_color; /* subtitles background color */ -extern int sub_bg_alpha; -extern char *subtitle_font_encoding; extern float text_font_scale_factor; -extern float osd_font_scale_factor; -extern float subtitle_font_radius; -extern float subtitle_font_thickness; extern int subtitle_autoscale; extern char *font_name; @@ -202,7 +190,6 @@ extern float font_factor; extern float sub_delay; extern float sub_fps; -extern int sub_justify; struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib); void osd_set_text(struct osd_state *osd, const char *text); |