summaryrefslogtreecommitdiffstats
path: root/player/command.c
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2016-09-19 19:54:54 +0200
committerwm4 <wm4@nowhere>2016-09-19 19:54:54 +0200
commitb62634c051e5657d60394a10d7ae8a8707f3bcc7 (patch)
tree8d8bbb946d3fdcbcc307fa5e1660e657475ee895 /player/command.c
parent75fe626aa60a4175c5b833ab8afe271120d88106 (diff)
downloadmpv-b62634c051e5657d60394a10d7ae8a8707f3bcc7.tar.bz2
mpv-b62634c051e5657d60394a10d7ae8a8707f3bcc7.tar.xz
player: make --terminal freetly settable at runtime
So client API users don't have to care about whether to set this before or after mpv_initialize(). We still don't enable terminal at any point before mpv_initialize(), because reasons. This also subtly changes some behavior how terminal options are applied while parsing. This essentially reverts the behavior as it was reported in issue #2588. Originally, I was hoping to get rid of the pre-parse option pass, but it seems this is absolutely not possible due to the way config and command line parsing are entangled. Command line options take priority over configfile options, so they have to be applied later - but we also want to apply logging and terminal options as specified on the command-line, but _before_ parsing the config files. It has to be this way to see config file error messages on the terminal, or to hide them if --no-terminal is used. libmpv considerations also factor into this.
Diffstat (limited to 'player/command.c')
-rw-r--r--player/command.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/player/command.c b/player/command.c
index a4a4263dde..bd7380cbec 100644
--- a/player/command.c
+++ b/player/command.c
@@ -5631,7 +5631,7 @@ void mp_option_change_callback(void *ctx, struct m_config_option *co, int flags)
struct MPContext *mpctx = ctx;
if (flags & UPDATE_TERM)
- mp_msg_update_msglevels(mpctx->global);
+ mp_update_logging(mpctx);
if (flags & UPDATE_RENDERER) {
if (mpctx->video_out)