RepoMirrors/mpv
1
0
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2025-04-27 05:39:21 +00:00
Code Issues Releases Wiki Activity

sub: cleanup: remove vo_osd_probar_type/value global variables

Browse Source
This commit is contained in:
wm4 2012-09-29 11:03:53 +02:00
parent e62b3a1750
commit 252ddcc014
5 changed files with 15 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
libvo/vo_caca.c
View File

@ -325,9 +325,9 @@ static void uninit(struct vo *vo)
static void draw_osd(struct vo *vo, struct osd_state *osd) static void draw_osd(struct vo *vo, struct osd_state *osd)
{ {
if (vo_osd_progbar_type != -1) if (osd->progbar_type != -1)
osdpercent(MESSAGE_DURATION, 0, 255, vo_osd_progbar_value, osdpercent(MESSAGE_DURATION, 0, 255, osd->progbar_value,
sub_osd_names[vo_osd_progbar_type], ""); sub_osd_names[osd->progbar_type], "");
} }
static int preinit(struct vo *vo, const char *arg) static int preinit(struct vo *vo, const char *arg)

6
mplayer.c
View File

@ -1430,7 +1430,7 @@ static mp_osd_msg_t *get_osd_msg(struct MPContext *mpctx)
// the difference is greater assume it's wrapped around from below 0 // the difference is greater assume it's wrapped around from below 0
if (mpctx->osd_visible - now > 36000000) { if (mpctx->osd_visible - now > 36000000) {
mpctx->osd_visible = 0; mpctx->osd_visible = 0;
vo_osd_progbar_type = -1; // disable mpctx->osd->progbar_type = -1; // disable
vo_osd_changed(OSDTYPE_PROGBAR); vo_osd_changed(OSDTYPE_PROGBAR);
mpctx->osd_function = mpctx->paused ? OSD_PAUSE : OSD_PLAY; mpctx->osd_function = mpctx->paused ? OSD_PAUSE : OSD_PLAY;
} }
@ -1490,8 +1490,8 @@ void set_osd_bar(struct MPContext *mpctx, int type, const char *name,
if (mpctx->sh_video && opts->term_osd != 1) { if (mpctx->sh_video && opts->term_osd != 1) {
mpctx->osd_visible = (GetTimerMS() + 1000) | 1; mpctx->osd_visible = (GetTimerMS() + 1000) | 1;
vo_osd_progbar_type = type; mpctx->osd->progbar_type = type;
vo_osd_progbar_value = 256 * (val - min) / (max - min); mpctx->osd->progbar_value = 256 * (val - min) / (max - min);
vo_osd_changed(OSDTYPE_PROGBAR); vo_osd_changed(OSDTYPE_PROGBAR);
return; return;
} }

12
sub/osd_libass.c
View File

@ -176,7 +176,7 @@ static void update_osd(struct osd_state *osd, struct osd_object *obj)
static void update_progbar(struct osd_state *osd, struct osd_object *obj) static void update_progbar(struct osd_state *osd, struct osd_object *obj)
{ {
if (vo_osd_progbar_type < 0) { if (osd->progbar_type < 0) {
clear_obj(obj); clear_obj(obj);
return; return;
} }
@ -199,16 +199,16 @@ static void update_progbar(struct osd_state *osd, struct osd_object *obj)
style->FontSize = 22.0; style->FontSize = 22.0;
style->Outline = style->FontSize / 16 * scale; style->Outline = style->FontSize / 16 * scale;
int active = (vo_osd_progbar_value * OSDBAR_ELEMS + 255) / 256; int active = (osd->progbar_value * OSDBAR_ELEMS + 255) / 256;
active = FFMIN(OSDBAR_ELEMS, FFMAX(active, 0)); active = FFMIN(OSDBAR_ELEMS, FFMAX(active, 0));
char *text = talloc_strdup(NULL, "{\\q2}"); char *text = talloc_strdup(NULL, "{\\q2}");
if (vo_osd_progbar_type >= 32) { if (osd->progbar_type >= 32) {
text = append_utf8_buffer(text, vo_osd_progbar_type); text = append_utf8_buffer(text, osd->progbar_type);
} else if (vo_osd_progbar_type > 0) { } else if (osd->progbar_type > 0) {
text = talloc_strdup_append_buffer(text, ASS_USE_OSD_FONT); text = talloc_strdup_append_buffer(text, ASS_USE_OSD_FONT);
text = append_utf8_buffer(text, OSD_CODEPOINTS + vo_osd_progbar_type); text = append_utf8_buffer(text, OSD_CODEPOINTS + osd->progbar_type);
text = talloc_strdup_append_buffer(text, "{\\r}"); text = talloc_strdup_append_buffer(text, "{\\r}");
} }

5
sub/sub.c
View File

@ -66,8 +66,6 @@ int sub_bg_color=0; /* subtitles background color */
int sub_bg_alpha=0; int sub_bg_alpha=0;
int sub_justify=0; int sub_justify=0;
int vo_osd_progbar_type=-1;
int vo_osd_progbar_value=100; // 0..256
subtitle* vo_sub=NULL; subtitle* vo_sub=NULL;
char *subtitle_font_encoding = NULL; char *subtitle_font_encoding = NULL;
float text_font_scale_factor = 3.5; float text_font_scale_factor = 3.5;
@ -113,6 +111,8 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
*osd = (struct osd_state) { *osd = (struct osd_state) {
.opts = opts, .opts = opts,
.ass_library = asslib, .ass_library = asslib,
.osd_text = talloc_strdup(osd, ""),
.progbar_type = -1,
}; };
for (int n = 0; n < MAX_OSD_PARTS; n++) { for (int n = 0; n < MAX_OSD_PARTS; n++) {
struct osd_object *obj = talloc_struct(osd, struct osd_object, { struct osd_object *obj = talloc_struct(osd, struct osd_object, {
@ -122,7 +122,6 @@ struct osd_state *osd_create(struct MPOpts *opts, struct ass_library *asslib)
obj->cache[i] = talloc_steal(obj, osd_conv_cache_new()); obj->cache[i] = talloc_steal(obj, osd_conv_cache_new());
osd->objs[n] = obj; osd->objs[n] = obj;
} }
osd->osd_text = talloc_strdup(osd, "");
osd_init_backend(osd); osd_init_backend(osd);
global_osd = osd; global_osd = osd;
return osd; return osd;

4
sub/sub.h
View File

@ -73,6 +73,7 @@ struct osd_state {
int w, h; int w, h;
char *osd_text; // OSDTYPE_OSD char *osd_text; // OSDTYPE_OSD
int progbar_type, progbar_value; // OSDTYPE_PROGBAR
// temporary for sub decoders // temporary for sub decoders
int bitmap_id; int bitmap_id;
@ -87,9 +88,6 @@ struct osd_state {
extern subtitle* vo_sub; extern subtitle* vo_sub;
extern int vo_osd_progbar_type;
extern int vo_osd_progbar_value; // 0..255
extern void* vo_spudec; extern void* vo_spudec;
extern void* vo_vobsub; extern void* vo_vobsub;