diff options
author | wm4 <wm4@nowhere> | 2013-12-16 20:40:02 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-12-16 20:41:08 +0100 |
commit | 7dc7b900c622235d595337c988a0c75280084b7c (patch) | |
tree | 7f896555c9478430edd28d56fb6fde5691b0e643 /mpvcore/player/osd.c | |
parent | 3e6cd3ef19aca7c79dfc73412f98b70b7de011b4 (diff) | |
download | mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.bz2 mpv-7dc7b900c622235d595337c988a0c75280084b7c.tar.xz |
Replace mp_tmsg, mp_dbg -> mp_msg, remove mp_gtext(), remove set_osd_tmsg
The tmsg stuff was for the internal gettext() based translation system,
which nobody ever attempted to use and thus was removed. mp_gtext() and
set_osd_tmsg() were also for this.
mp_dbg was once enabled in debug mode only, but since we have log level
for enabling debug messages, it seems utterly useless.
Diffstat (limited to 'mpvcore/player/osd.c')
-rw-r--r-- | mpvcore/player/osd.c | 13 |
1 files changed, 2 insertions, 11 deletions
diff --git a/mpvcore/player/osd.c b/mpvcore/player/osd.c index 1674fcab8b..42409b555f 100644 --- a/mpvcore/player/osd.c +++ b/mpvcore/player/osd.c @@ -213,15 +213,6 @@ void set_osd_msg(struct MPContext *mpctx, int id, int level, int time, va_end(ap); } -void set_osd_tmsg(struct MPContext *mpctx, int id, int level, int time, - const char *fmt, ...) -{ - va_list ap; - va_start(ap, fmt); - set_osd_msg_va(mpctx, id, level, time, mp_gtext(fmt), ap); - va_end(ap); -} - /** * \brief Remove a message from the OSD stack * @@ -451,14 +442,14 @@ static void add_seek_osd_messages(struct MPContext *mpctx) } if (mpctx->add_osd_seek_info & OSD_SEEK_INFO_CHAPTER_TEXT) { char *chapter = chapter_display_name(mpctx, get_current_chapter(mpctx)); - set_osd_tmsg(mpctx, OSD_MSG_TEXT, 1, mpctx->opts->osd_duration, + set_osd_msg(mpctx, OSD_MSG_TEXT, 1, mpctx->opts->osd_duration, "Chapter: %s", chapter); talloc_free(chapter); } if ((mpctx->add_osd_seek_info & OSD_SEEK_INFO_EDITION) && mpctx->master_demuxer) { - set_osd_tmsg(mpctx, OSD_MSG_TEXT, 1, mpctx->opts->osd_duration, + set_osd_msg(mpctx, OSD_MSG_TEXT, 1, mpctx->opts->osd_duration, "Playing edition %d of %d.", mpctx->master_demuxer->edition + 1, mpctx->master_demuxer->num_editions); |