diff options
| author | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
|---|---|---|
| committer | wm4 <wm4@nowhere> | 2013-12-21 23:15:32 +0100 |
| commit | 0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2 (patch) | |
| tree | b70f214f8c3fc802d6d6edbf8395273c854ac0fd /player/osd.c | |
| parent | a4fe95b0d8d339ba5afbdb5346ad8fd367a4a1c1 (diff) | |
| parent | 245e5b844177e9ad9a9c07eff5efab7c3fccdebc (diff) | |
| download | mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.bz2 mpv-0a3e9a9ac3a90da831b497e0613dfb66bc14f3d2.tar.xz | |
Merge branch 'msg_refactor'
This branch changes mp_msg() so that it doesn't require global context.
The changes are pretty violent.
Diffstat (limited to 'player/osd.c')
| -rw-r--r-- | player/osd.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/player/osd.c b/player/osd.c index f475757bdc..607af6714e 100644 --- a/player/osd.c +++ b/player/osd.c @@ -72,13 +72,13 @@ void write_status_line(struct MPContext *mpctx, const char *line) { struct MPOpts *opts = mpctx->opts; if (opts->slave_mode) { - MP_MSG(mpctx, MSGL_STATUS, "%s\n", line); + mp_msg(mpctx->statusline, MSGL_STATUS, "%s\n", line); } else if (erase_to_end_of_line) { - MP_MSG(mpctx, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line); + mp_msg(mpctx->statusline, MSGL_STATUS, "%s%s\r", line, erase_to_end_of_line); } else { int pos = strlen(line); int width = get_term_width() - pos; - MP_MSG(mpctx, MSGL_STATUS, "%s%*s\r", line, width, ""); + mp_msg(mpctx->statusline, MSGL_STATUS, "%s%*s\r", line, width, ""); } } |