msg: add msg-status-stderr option

Fixes: #14133
mpv-player · May 13, 2024 · fd62230 · fd62230
1 parent 696c626
commit fd62230
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 0 deletions.
diff --git a/DOCS/interface-changes/msg-status-stderr.txt b/DOCS/interface-changes/msg-status-stderr.txt
@@ -0,0 +1 @@
+add `--msg-status-stderr` option
diff --git a/DOCS/man/options.rst b/DOCS/man/options.rst
@@ -5000,6 +5000,9 @@ Terminal
     later actually), using a monotonic time source depending on the OS. This
     is ``CLOCK_MONOTONIC`` on sane UNIX variants.
 
+``--msg-status-stderr``
+    Print status line to stderr.
+
 Cache
 -----
 

diff --git a/common/msg.c b/common/msg.c
@@ -96,6 +96,7 @@ struct mp_log_root {
     // --- protected by log_file_lock
     bool log_file_thread_active; // also termination signal for the thread
     int module_indent;
+    bool status_stderr;
 };
 
 struct mp_log {
@@ -194,6 +195,8 @@ int mp_msg_level(struct mp_log *log)
 
 static inline int term_msg_fileno(struct mp_log_root *root, int lev)
 {
+    if (lev == MSGL_STATUS && root->status_stderr)
+        return STDERR_FILENO;
     return root->force_stderr ? STDERR_FILENO : STDOUT_FILENO;
 }
 
@@ -770,6 +773,11 @@ void mp_msg_update_msglevels(struct mpv_global *global, struct MPOpts *opts)
     root->use_terminal = opts->use_terminal;
     root->show_time = opts->msg_time;
 
+    if (root->status_stderr != opts->msg_status_stderr) {
+        msg_flush_status_line(root, true);
+        root->status_stderr = opts->msg_status_stderr;
+    }
+
     if (root->really_quiet)
         root->status_lines = 0;
 

diff --git a/options/options.c b/options/options.c
@@ -510,6 +510,7 @@ static const m_option_t mp_opts[] = {
         .flags = CONF_PRE_PARSE | M_OPT_FILE | UPDATE_TERM},
     {"msg-module", OPT_BOOL(msg_module), .flags = UPDATE_TERM},
     {"msg-time", OPT_BOOL(msg_time), .flags = UPDATE_TERM},
+    {"msg-status-stderr", OPT_BOOL(msg_status_stderr), .flags = UPDATE_TERM},
 #if HAVE_WIN32_DESKTOP
     {"priority", OPT_CHOICE(w32_priority,
         {"no",          0},

diff --git a/options/options.h b/options/options.h
@@ -160,6 +160,7 @@ typedef struct MPOpts {
     bool msg_color;
     bool msg_module;
     bool msg_time;
+    bool msg_status_stderr;
     char *log_file;
 
     int operation_mode;