diff options
| author | wm4 <wm4@nowhere> | 2012-09-29 11:03:53 +0200 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2012-10-16 07:26:31 +0200 |
| commit | 252ddcc014b7672a4434823fc6275be1b039bd79 (patch) | |
| tree | 5bd84ef90f84a5b9c5a60d99eae2cedb3321207d /sub/osd_libass.c | |
| parent | e62b3a175016eaf93ef5ead7ea3891bc85327a55 (diff) | |
| download | mpv-252ddcc014b7672a4434823fc6275be1b039bd79.tar.bz2 mpv-252ddcc014b7672a4434823fc6275be1b039bd79.tar.xz | |
sub: cleanup: remove vo_osd_probar_type/value global variables
Diffstat (limited to 'sub/osd_libass.c')
| -rw-r--r-- | sub/osd_libass.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/sub/osd_libass.c b/sub/osd_libass.c index 6c325642c5..dee60c7df7 100644 --- a/sub/osd_libass.c +++ b/sub/osd_libass.c @@ -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) { - if (vo_osd_progbar_type < 0) { + if (osd->progbar_type < 0) { clear_obj(obj); return; } @@ -199,16 +199,16 @@ static void update_progbar(struct osd_state *osd, struct osd_object *obj) style->FontSize = 22.0; 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)); char *text = talloc_strdup(NULL, "{\\q2}"); - if (vo_osd_progbar_type >= 32) { - text = append_utf8_buffer(text, vo_osd_progbar_type); - } else if (vo_osd_progbar_type > 0) { + if (osd->progbar_type >= 32) { + text = append_utf8_buffer(text, osd->progbar_type); + } else if (osd->progbar_type > 0) { 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}"); } |