diff options
Diffstat (limited to 'sub/sub.h')
| -rw-r--r-- | sub/sub.h | 26 |
1 files changed, 8 insertions, 18 deletions
@@ -85,8 +85,7 @@ struct mp_osd_res { enum mp_osdtype { OSDTYPE_SUB, - OSDTYPE_SUBTITLE, - OSDTYPE_SPU, + OSDTYPE_SUBTEXT, OSDTYPE_PROGBAR, OSDTYPE_OSD, @@ -121,23 +120,25 @@ struct osd_state { struct ass_library *ass_library; struct ass_renderer *ass_renderer; - struct sh_sub *sh_sub; double sub_offset; double vo_pts; bool render_subs_in_filter; + bool render_bitmap_subs; bool want_redraw; // OSDTYPE_OSD char *osd_text; + // OSDTYPE_SUBTEXT + char *sub_text; // OSDTYPE_PROGBAR int progbar_type; // <0: disabled, 1-255: symbol, else: no symbol float progbar_value; // range 0.0-1.0 float *progbar_stops; // used for chapter indicators (0.0-1.0 each) int progbar_num_stops; - - int switch_sub_id; + // OSDTYPE_SUB + struct dec_sub *dec_sub; struct MPOpts *opts; @@ -149,11 +150,6 @@ struct osd_state { struct ass_library *osd_ass_library; }; -extern struct subtitle* vo_sub; - -extern void* vo_spudec; -extern void* vo_vobsub; - // Start of OSD symbols in osd_font.pfb #define OSD_CODEPOINTS 0xE000 @@ -197,16 +193,10 @@ struct osd_style_opts { extern const struct m_sub_options osd_style_conf; -extern char *sub_cp; -extern int sub_pos; - -extern float sub_delay; -extern float sub_fps; - - struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib); void osd_set_text(struct osd_state *osd, const char *text); -void vo_osd_changed(int new_value); +void osd_set_sub(struct osd_state *osd, const char *text); +void osd_changed(struct osd_state *osd, int new_value); void osd_changed_all(struct osd_state *osd); void osd_free(struct osd_state *osd); |