From 07fd511e143f8fd17d9e662ca0c060527c29e0e1 Mon Sep 17 00:00:00 2001 From: wm4 Date: Sun, 10 Nov 2019 23:53:57 +0100 Subject: options: remove M_SETOPT_RUNTIME Used to contain flags for "save" setting of options at runtime. Now there is nothing special needed anymore and it's 0. So drop it completely, and remove anything that distinguishes between runtime and initialization time. --- player/client.c | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) (limited to 'player/client.c') diff --git a/player/client.c b/player/client.c index ccd6a1d0a0..a22b56a188 100644 --- a/player/client.c +++ b/player/client.c @@ -930,7 +930,6 @@ void mpv_free_node_contents(mpv_node *node) int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format, void *data) { - int flags = ctx->mpctx->initialized ? M_SETOPT_RUNTIME : 0; const struct m_option *type = get_mp_type(format); if (!type) return MPV_ERROR_OPTION_FORMAT; @@ -941,8 +940,7 @@ int mpv_set_option(mpv_handle *ctx, const char *name, mpv_format format, data = &tmp; } lock_core(ctx); - int err = m_config_set_option_node(ctx->mpctx->mconfig, bstr0(name), - data, flags); + int err = m_config_set_option_node(ctx->mpctx->mconfig, bstr0(name), data, 0); unlock_core(ctx); switch (err) { case M_OPT_MISSING_PARAM: @@ -1715,9 +1713,8 @@ int mpv_hook_continue(mpv_handle *ctx, uint64_t id) int mpv_load_config_file(mpv_handle *ctx, const char *filename) { - int flags = ctx->mpctx->initialized ? M_SETOPT_RUNTIME : 0; lock_core(ctx); - int r = m_config_parse_config_file(ctx->mpctx->mconfig, filename, NULL, flags); + int r = m_config_parse_config_file(ctx->mpctx->mconfig, filename, NULL, 0); unlock_core(ctx); if (r == 0) return MPV_ERROR_INVALID_PARAMETER; -- cgit v1.2.3