diff options
| -rw-r--r-- | DOCS/man/en/mplayer.1 | 6 | ||||
| -rw-r--r-- | cfg-mplayer.h | 5 | ||||
| -rw-r--r-- | mplayer.c | 4 |
3 files changed, 12 insertions, 3 deletions
diff --git a/DOCS/man/en/mplayer.1 b/DOCS/man/en/mplayer.1 index d3ca2837c7..c0b3dbf406 100644 --- a/DOCS/man/en/mplayer.1 +++ b/DOCS/man/en/mplayer.1 @@ -762,6 +762,12 @@ Video filters are not applied to such frames. For B-frames even decoding is skipped completely. . .TP +.B \-(no)gui +Enable or disable the GUI interface (default depends on binary name). +Only works as the first argument on the command line. +Does not work as a config-file option. +. +.TP .B \-h, \-help, \-\-help Show short summary of options. . diff --git a/cfg-mplayer.h b/cfg-mplayer.h index 2440f25723..ef9b899a27 100644 --- a/cfg-mplayer.h +++ b/cfg-mplayer.h @@ -329,9 +329,8 @@ m_option_t mplayer_opts[]={ {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif - {"gui", "Please remove gui=yes from your config file. Run gmplayer if you want the GUI.\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, -// {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL|CONF_NOCMD, 0, 1, NULL}, -// {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, + {"gui", "The -gui option will only work as first commandline argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1}, + {"nogui", "The -nogui option will only work as first commandline argument.\n", CONF_TYPE_PRINT, 0, 0, 0, (void *)1}, #ifdef HAVE_NEW_GUI {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, @@ -2625,6 +2625,10 @@ struct {double pts; vo_functions_t *vo;} vf_vo_data; tv_param_immediate = 1; #endif + if (argc > 1 && argv[1] && + (!strcmp(argv[1], "-gui") || !strcmp(argv[1], "-nogui"))) { + use_gui = !strcmp(argv[1], "-gui"); + } else if ( argv[0] ) { char *base = strrchr(argv[0], '/'); |