Mercurial > mplayer.hg
changeset 4158:479c7828edbb
GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>
| author | arpi |
|---|---|
| date | Mon, 14 Jan 2002 23:55:51 +0000 |
| parents | 9ff9f6ce6799 |
| children | 42fec596fe7c |
| files | cfg-mencoder.h cfg-mplayer.h |
| diffstat | 2 files changed, 20 insertions(+), 20 deletions(-) [+] |
line wrap: on
line diff
--- a/cfg-mencoder.h Mon Jan 14 23:54:31 2002 +0000 +++ b/cfg-mencoder.h Mon Jan 14 23:55:51 2002 +0000 @@ -85,9 +85,9 @@ {NULL, NULL, 0, 0, 0, 0, NULL} }; -struct config mencoder_opts[]={ +static config_t mplayer_opts[]={ /* name, pointer, type, flags, min, max */ - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, /* this must be the first!!! */ + {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this must be the first!!! */ {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL}, {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, @@ -126,8 +126,8 @@ #undef MAIN_CONF // {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, NULL}, + {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, + {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL, 0, 0, NULL}, // {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, // {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},
--- a/cfg-mplayer.h Mon Jan 14 23:54:31 2002 +0000 +++ b/cfg-mplayer.h Mon Jan 14 23:55:51 2002 +0000 @@ -109,9 +109,9 @@ * by Folke */ -struct config mplayer_opts[]={ +static config_t mplayer_opts[]={ /* name, pointer, type, flags, min, max */ - {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0, NULL}, /* this must be the first!!! */ + {"include", cfg_include, CONF_TYPE_FUNC_PARAM, CONF_NOSAVE, 0, 0, NULL}, /* this don't need anymore to be the first!!! */ //---------------------- libao/libvo/mplayer options ------------------------ {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", @@ -211,8 +211,8 @@ {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver\n", CONF_TYPE_PRINT, 0, 0, 0, NULL}, #endif - {"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, - {"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, + {"y", &opt_screen_size_y, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenw", &vo_screenwidth, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, @@ -240,7 +240,7 @@ #endif #ifdef HAVE_LIRC - {"lircconf", &lirc_configfile, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"lircconf", &lirc_configfile, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif #ifdef USE_DVDREAD @@ -248,19 +248,19 @@ {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, #endif - {"gui", &use_gui, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"nogui", &use_gui, CONF_TYPE_FLAG, 0, 1, 0, NULL}, + {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL}, #ifdef HAVE_NEW_GUI - {"skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL}, #endif - {"playlist", &playlist_file, CONF_TYPE_STRING, 0, 0, 0, NULL}, + {"playlist", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"dapsync", &dapsync, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"nodapsync", &dapsync, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"softsleep", &softsleep, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"slave", &slave_mode, CONF_TYPE_FLAG, 0, 0, 1, NULL}, + {"slave", &slave_mode, CONF_TYPE_FLAG,CONF_GLOBAL , 0, 1, NULL}, #ifdef HAVE_X11 {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL}, @@ -275,11 +275,11 @@ #include "cfg-common.h" #undef MAIN_CONF - {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, - {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, - {"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, NULL}, - {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, - {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, + {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL}, + {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL}, + {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL}, + {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, + {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, + {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL}, {NULL, NULL, 0, 0, 0, 0, NULL} };