diff options
author | wm4 <wm4@nowhere> | 2013-05-27 22:19:47 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2013-05-27 22:28:03 +0200 |
commit | 7ea5d085f94807bb4ae9e4c8d738dab138d73d49 (patch) | |
tree | 7c515af10ec883e2ac967d12ad148dd135f17db5 /core/mplayer.c | |
parent | 41e6c922a58dd97a5c43855a58c3e879074ffc0f (diff) | |
download | mpv-7ea5d085f94807bb4ae9e4c8d738dab138d73d49.tar.bz2 mpv-7ea5d085f94807bb4ae9e4c8d738dab138d73d49.tar.xz |
mplayer: output status line normally with --no-consolecontrols
In commit 0e07189, I made the status line always print a newline,
instead of cutting the output at 80 columns (or if stderr is a terminal,
whatever width the terminal reports). This is better in the case the
output goes into a log file or a pipe.
This caused problems for people who want to pipe raw video to mpv, so
change it again. (Not sure why they won't use FIFOs instead.)
Now output untrimmed lines if the slave mode flag is set, which makes
sense to do, too. The current slave mode is still on life support,
though.
Diffstat (limited to 'core/mplayer.c')
-rw-r--r-- | core/mplayer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/core/mplayer.c b/core/mplayer.c index 7aeb91f1b2..ad8441f476 100644 --- a/core/mplayer.c +++ b/core/mplayer.c @@ -1181,7 +1181,7 @@ static int get_term_width(void) static void write_status_line(struct MPContext *mpctx, const char *line) { struct MPOpts *opts = &mpctx->opts; - if (!opts->consolecontrols) { + if (opts->slave_mode) { mp_msg(MSGT_STATUSLINE, MSGL_STATUS, "%s\n", line); } else if (erase_to_end_of_line) { mp_msg(MSGT_STATUSLINE, MSGL_STATUS, |