diff options
author | Ricardo Constantino <wiiaboo@gmail.com> | 2016-09-23 23:36:17 +0100 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2016-09-26 19:25:14 +0200 |
commit | f0ab9f05f1709ccda63e7e695031e1030dee6626 (patch) | |
tree | 1eb3156c30ec30d0ad154f6fc3fd7261e4f9dead /player/main.c | |
parent | dd339b200be99ecac1a0bb4a7509b338120c5bce (diff) | |
download | mpv-f0ab9f05f1709ccda63e7e695031e1030dee6626.tar.bz2 mpv-f0ab9f05f1709ccda63e7e695031e1030dee6626.tar.xz |
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 <wm4@nowhere>
Diffstat (limited to 'player/main.c')
-rw-r--r-- | player/main.c | 7 |
1 files changed, 5 insertions, 2 deletions
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); |