Mercurial > mplayer.hg
changeset 19355:ba95c4fa0684
Reintroduce an ugly variant of the -gui/-nogui options.
| author | reimar |
|---|---|
| date | Tue, 08 Aug 2006 14:13:51 +0000 |
| parents | cd767a4c8b94 |
| children | 595ac8077dc5 |
| files | DOCS/man/en/mplayer.1 cfg-mplayer.h mplayer.c |
| diffstat | 3 files changed, 12 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/DOCS/man/en/mplayer.1 Tue Aug 08 11:55:23 2006 +0000 +++ b/DOCS/man/en/mplayer.1 Tue Aug 08 14:13:51 2006 +0000 @@ -762,6 +762,12 @@ 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. .
--- a/cfg-mplayer.h Tue Aug 08 11:55:23 2006 +0000 +++ b/cfg-mplayer.h Tue Aug 08 14:13:51 2006 +0000 @@ -329,9 +329,8 @@ {"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},
--- a/mplayer.c Tue Aug 08 11:55:23 2006 +0000 +++ b/mplayer.c Tue Aug 08 14:13:51 2006 +0000 @@ -2625,6 +2625,10 @@ 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], '/');