diff options
author | wm4 <wm4@nowhere> | 2013-12-21 19:06:37 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-21 20:50:13 +0100 |
commit | 3846fc758789711347c0b11f87736b27fc6210a0 (patch) | |
tree | e9b01445291326f0a026e0b002d78f1487d781b2 /sub/ass_mp.c | |
parent | 92f9b514263d8becf670c19567826bd288595fe7 (diff) | |
download | mpv-3846fc758789711347c0b11f87736b27fc6210a0.tar.bz2 mpv-3846fc758789711347c0b11f87736b27fc6210a0.tar.xz |
sub/osd: mp_msg conversions
Diffstat (limited to 'sub/ass_mp.c')
-rw-r--r-- | sub/ass_mp.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/sub/ass_mp.c b/sub/ass_mp.c index cdf302f959..39737824a2 100644 --- a/sub/ass_mp.c +++ b/sub/ass_mp.c @@ -29,7 +29,7 @@ #include <libavutil/common.h> -#include "config.h" +#include "common/global.h" #include "common/msg.h" #include "options/path.h" #include "ass_mp.h" @@ -150,7 +150,8 @@ void mp_ass_configure(ASS_Renderer *priv, struct MPOpts *opts, ass_set_line_spacing(priv, set_line_spacing); } -void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts) +void mp_ass_configure_fonts(ASS_Renderer *priv, struct osd_style_opts *opts, + struct mpv_global *global, struct mp_log *log) { char *default_font = mp_find_user_config_file("subfont.ttf"); char *config = mp_find_config_file("fonts.conf"); @@ -216,22 +217,25 @@ static int map_ass_level[] = { static void message_callback(int level, const char *format, va_list va, void *ctx) { + struct mp_log *log = ctx; + if (!log) + return; level = map_ass_level[level]; - mp_msg_va(MSGT_ASS, level, format, va); + mp_msg_log_va(log, level, format, va); // libass messages lack trailing \n - mp_msg(MSGT_ASS, level, "\n"); + mp_msg_log(log, level, "\n"); } -ASS_Library *mp_ass_init(struct MPOpts *opts) +ASS_Library *mp_ass_init(struct mpv_global *global, struct mp_log *log) { char *path = mp_find_user_config_file("fonts"); ASS_Library *priv = ass_library_init(); if (!priv) abort(); - ass_set_message_cb(priv, message_callback, NULL); + ass_set_message_cb(priv, message_callback, log); if (path) ass_set_fonts_dir(priv, path); - ass_set_extract_fonts(priv, opts->use_embedded_fonts); + ass_set_extract_fonts(priv, global->opts->use_embedded_fonts); talloc_free(path); return priv; } |