github/mpv
1
Fork 0
mirror of https://github.com/mpv-player/mpv synced 2024-09-09 01:16:56 +02:00
Code Releases Activity

GLOBAL flags and other changes for new config - patch by Alban Bedel <albeu@free.fr>

Browse Source 
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@4159 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
arpi 2002-01-14 23:55:51 +00:00
parent 8114d1badf
commit afd9de3d71
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
cfg-mencoder.h
View File

@ -85,9 +85,9 @@ struct config oac_conf[]={
{NULL, NULL, 0, 0, 0, 0, NULL} {NULL, NULL, 0, 0, 0, 0, NULL}
}; };
struct config mencoder_opts[]={ static config_t mplayer_opts[]={
/* name, pointer, type, flags, min, max */ /* 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}, {"ofps", &force_ofps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0, NULL},
{"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"o", &out_filename, CONF_TYPE_STRING, 0, 0, 0, NULL},
@ -126,8 +126,8 @@ struct config mencoder_opts[]={
#undef MAIN_CONF #undef MAIN_CONF
// {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, // {"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
{"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, 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},
// {"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}, // {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL},

32
cfg-mplayer.h
View File

@ -109,9 +109,9 @@ extern int readPPOpt(void *conf, char *arg);
* by Folke * by Folke
*/ */
struct config mplayer_opts[]={ static config_t mplayer_opts[]={
/* name, pointer, type, flags, min, max */ /* 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 ------------------------ //---------------------- libao/libvo/mplayer options ------------------------
{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n", {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
@ -211,8 +211,8 @@ struct config mplayer_opts[]={
{"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver\n", {"sdla", "Use -ao sdl:driver instead of -ao sdl -sdla driver\n",
CONF_TYPE_PRINT, 0, 0, 0, NULL}, CONF_TYPE_PRINT, 0, 0, 0, NULL},
#endif #endif
{"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL}, {"x", &opt_screen_size_x, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
{"y", &screen_size_y, 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}, {"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
{"screenw", &vo_screenwidth, 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}, {"screenh", &vo_screenheight, CONF_TYPE_INT, CONF_RANGE, 0, 4096, NULL},
@ -240,7 +240,7 @@ struct config mplayer_opts[]={
#endif #endif
#ifdef HAVE_LIRC #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 #endif
#ifdef USE_DVDREAD #ifdef USE_DVDREAD
@ -248,19 +248,19 @@ struct config mplayer_opts[]={
{"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"slang", &dvdsub_lang, CONF_TYPE_STRING, 0, 0, 0, NULL},
#endif #endif
{"gui", &use_gui, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"gui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"nogui", &use_gui, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"nogui", &use_gui, CONF_TYPE_FLAG, CONF_GLOBAL, 1, 0, NULL},
#ifdef HAVE_NEW_GUI #ifdef HAVE_NEW_GUI
{"skin", &skinName, CONF_TYPE_STRING, 0, 0, 0, NULL}, {"skin", &skinName, CONF_TYPE_STRING, CONF_GLOBAL, 0, 0, NULL},
#endif #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}, {"dapsync", &dapsync, CONF_TYPE_FLAG, 0, 0, 1, NULL},
{"nodapsync", &dapsync, CONF_TYPE_FLAG, 0, 1, 0, NULL}, {"nodapsync", &dapsync, CONF_TYPE_FLAG, 0, 1, 0, NULL},
{"softsleep", &softsleep, CONF_TYPE_FLAG, 0, 0, 1, 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 #ifdef HAVE_X11
{"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL}, {"wid", &WinID, CONF_TYPE_INT, 0, 0, 0, NULL},
@ -275,11 +275,11 @@ struct config mplayer_opts[]={
#include "cfg-common.h" #include "cfg-common.h"
#undef MAIN_CONF #undef MAIN_CONF
{"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1, NULL}, {"quiet", &quiet, CONF_TYPE_FLAG, CONF_GLOBAL, 0, 1, NULL},
{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100, NULL}, {"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE|CONF_GLOBAL, 0, 100, NULL},
{"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0, NULL}, {"v", cfg_inc_verbose, CONF_TYPE_FUNC, CONF_GLOBAL|CONF_NOSAVE, 0, 0, NULL},
{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0, NULL}, {"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG|CONF_GLOBAL, 0, 0, NULL},
{NULL, NULL, 0, 0, 0, 0, NULL} {NULL, NULL, 0, 0, 0, 0, NULL}
}; };