diff options
author | wm4 <wm4@nowhere> | 2014-12-02 20:35:18 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2014-12-02 20:36:55 +0100 |
commit | f984b797201309206e3821ead83c1ce49cee19da (patch) | |
tree | cf0982b905a59e575ddc8c1ca5d39afe977ed15c /player/client.c | |
parent | ef1c7563c530bebf01493d494b960da4a06fa242 (diff) | |
download | mpv-f984b797201309206e3821ead83c1ce49cee19da.tar.bz2 mpv-f984b797201309206e3821ead83c1ce49cee19da.tar.xz |
client API: allow multiple mpv instances with terminal=yes
This is simply not allowed, and doing it triggered an assertion. It's
still not allowed, because the terminal and related functionality is a
global resource, and there doesn't seem to be a sane way to manage the
signal handlers.
But be a bit nicer, and just the terminal if it's already in use.
Note that terminal _output_ happens anyway. This becomes usable with
this commit. To facilitate logging-only usage further, also explicitly
disable terminal input, so that "terminal=yes" can be used for logging
without much interference with other things. (It'll still overwrite some
signal handlers, though.)
Diffstat (limited to 'player/client.c')
-rw-r--r-- | player/client.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/player/client.c b/player/client.c index 4d903941d7..d86217106e 100644 --- a/player/client.c +++ b/player/client.c @@ -409,6 +409,7 @@ mpv_handle *mpv_create(void) mpv_set_option_string(ctx, "config", "no"); mpv_set_option_string(ctx, "idle", "yes"); mpv_set_option_string(ctx, "terminal", "no"); + mpv_set_option_string(ctx, "input-terminal", "no"); mpv_set_option_string(ctx, "osc", "no"); mpv_set_option_string(ctx, "ytdl", "no"); mpv_set_option_string(ctx, "input-default-bindings", "no"); |