diff options
author | wm4 <wm4@nowhere> | 2018-05-21 16:25:52 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2018-05-24 19:56:35 +0200 |
commit | f8ab59eacdde31af39f4defeb964adf4de140a50 (patch) | |
tree | c353dede917a1f371a02e848f174aa4e541ffe97 /input/ipc-win.c | |
parent | a770006c6ec1c0173e33a63d36cafca743e63808 (diff) | |
download | mpv-f8ab59eacdde31af39f4defeb964adf4de140a50.tar.bz2 mpv-f8ab59eacdde31af39f4defeb964adf4de140a50.tar.xz |
player: get rid of mpv_global.opts
This was always a legacy thing. Remove it by applying an orgy of
mp_get_config_group() calls, and sometimes m_config_cache_alloc() or
mp_read_option_raw().
win32 changes untested.
Diffstat (limited to 'input/ipc-win.c')
-rw-r--r-- | input/ipc-win.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/input/ipc-win.c b/input/ipc-win.c index 3cbdad3749..8bfbaf409b 100644 --- a/input/ipc-win.c +++ b/input/ipc-win.c @@ -29,6 +29,7 @@ #include "common/msg.h" #include "input/input.h" #include "libmpv/client.h" +#include "options/m_config.h" #include "options/options.h" #include "player/client.h" @@ -449,7 +450,7 @@ done: struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api, struct mpv_global *global) { - struct MPOpts *opts = global->opts; + struct MPOpts *opts = mp_get_config_group(NULL, global, GLOBAL_CONFIG); struct mp_ipc_ctx *arg = talloc_ptrtype(NULL, arg); *arg = (struct mp_ipc_ctx){ @@ -478,12 +479,14 @@ struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api, if (pthread_create(&arg->thread, NULL, ipc_thread, arg)) goto out; + talloc_free(opts); return arg; out: if (arg->death_event) CloseHandle(arg->death_event); talloc_free(arg); + talloc_free(opts); return NULL; } |