summaryrefslogtreecommitdiffstats
path: root/input
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2019-11-29 00:16:52 +0100
committerwm4 <wm4@nowhere>2019-11-29 12:14:43 +0100
commit1cb085a82e89ce4c9150871c910c75d9404d1e01 (patch)
treeab0fdbaa22568377a051aaef4740d5cf3656a543 /input
parent5083db91ebff2fa469d94520bd3e8e535da74b8d (diff)
downloadmpv-1cb085a82e89ce4c9150871c910c75d9404d1e01.tar.bz2
mpv-1cb085a82e89ce4c9150871c910c75d9404d1e01.tar.xz
options: get rid of GLOBAL_CONFIG hack
Just an implementation detail that can be cleaned up now. Internally, m_config maintains a tree of m_sub_options structs, except for the root it was not defined explicitly. GLOBAL_CONFIG was a hack to get access to it anyway. Define it explicitly instead.
Diffstat (limited to 'input')
-rw-r--r--input/ipc-unix.c2
-rw-r--r--input/ipc-win.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/input/ipc-unix.c b/input/ipc-unix.c
index 94a0b4700b..bfd035298c 100644
--- a/input/ipc-unix.c
+++ b/input/ipc-unix.c
@@ -387,7 +387,7 @@ done:
struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api,
struct mpv_global *global)
{
- struct MPOpts *opts = mp_get_config_group(NULL, global, GLOBAL_CONFIG);
+ struct MPOpts *opts = mp_get_config_group(NULL, global, &mp_opt_root);
struct mp_ipc_ctx *arg = talloc_ptrtype(NULL, arg);
*arg = (struct mp_ipc_ctx){
diff --git a/input/ipc-win.c b/input/ipc-win.c
index 8bfbaf409b..727a8cca73 100644
--- a/input/ipc-win.c
+++ b/input/ipc-win.c
@@ -450,7 +450,7 @@ done:
struct mp_ipc_ctx *mp_init_ipc(struct mp_client_api *client_api,
struct mpv_global *global)
{
- struct MPOpts *opts = mp_get_config_group(NULL, global, GLOBAL_CONFIG);
+ struct MPOpts *opts = mp_get_config_group(NULL, global, &mp_opt_root);
struct mp_ipc_ctx *arg = talloc_ptrtype(NULL, arg);
*arg = (struct mp_ipc_ctx){