From f0ab9f05f1709ccda63e7e695031e1030dee6626 Mon Sep 17 00:00:00 2001 From: Ricardo Constantino Date: Fri, 23 Sep 2016 23:36:17 +0100 Subject: player: allow opts in pseudo-gui set by the user to override user's default This should still allow user-set default options to override built-in pseudo-gui while respecting user-set pseudo-gui options. Pros: - user option in default profile overrides built-in pseudo-gui's options Ex: screenshot-directory overrides built-in pseudo-gui's - user can "fix" pseudo-gui if some option like "force-window=no" is set in default by setting "force-window=yes" in [pseudo-gui] - `mpv --profile=pseudo-gui` will work as before Cons: - --show-profile=pseudo-gui won't display the built-in's options Original idea from wm4. Documentation edits mostly by wm4. Signed-off-by: wm4 --- player/main.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'player/main.c') diff --git a/player/main.c b/player/main.c index 678ef5a5a1..ad907e034a 100644 --- a/player/main.c +++ b/player/main.c @@ -408,8 +408,11 @@ int mp_initialize(struct MPContext *mpctx, char **options) return r == M_OPT_EXIT ? -2 : -1; } - if (opts->operation_mode == 1) - m_config_set_profile(mpctx->mconfig, "pseudo-gui", M_SETOPT_NO_OVERWRITE); + if (opts->operation_mode == 1) { + m_config_set_profile(mpctx->mconfig, "builtin-pseudo-gui", + M_SETOPT_NO_OVERWRITE); + m_config_set_profile(mpctx->mconfig, "pseudo-gui", 0); + } mp_get_resume_defaults(mpctx); -- cgit v1.2.3