new configfile/cmdline parser

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@154 b3059339-0415-0410-9bf9-f77b7e298cf2

1 files changed, 24 insertions, 20 deletions

diff --git a/cfg-mplayer.h b/cfg-mplayer.h
index f0be7d0787..1505fb13c0 100644
--- a/cfg-mplayer.h
+++ b/cfg-mplayer.h
@@ -2,46 +2,50 @@
  * config for cfgparser
  */
 
-#include "cfg-mplayer-func.h"
-
 struct config conf[]={
 	/* name, pointer, type, flags, min, max */
+	{"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
+            CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
 	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
 	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
 	{"bg", &play_in_bg, CONF_TYPE_FLAG, 0, 0, 1},
 	{"nobg", &play_in_bg, CONF_TYPE_FLAG, 0, 1, 0},
-	{"sb", &seek_to_byte, CONF_TYPE_INT, 0, 0, 0},
-	{"ss", &seek_to_sec, CONF_TYPE_INT, 0, 0, 0},
+	{"sb", &seek_to_byte, CONF_TYPE_INT, CONF_MIN, 0, 0},
+	{"ss", &seek_to_sec, CONF_TYPE_INT, CONF_MIN, 0, 0},
 	{"sound", &has_audio, CONF_TYPE_FLAG, 0, 0, 1},
 	{"nosound", &has_audio, CONF_TYPE_FLAG, 0, 1, 0},
-	{"abs", &audio_buffer_size, CONF_TYPE_INT, 0, 0, 0},
-	{"delay", &audio_delay, CONF_TYPE_FLOAT, 0, 0, 0},
+	{"abs", &audio_buffer_size, CONF_TYPE_INT, CONF_MIN, 0, 0},
+	{"delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -10.0, 10.0},
 	{"bps", &pts_from_bps, CONF_TYPE_FLAG, 0, 0, 1},
 	{"nobps", &pts_from_bps, CONF_TYPE_FLAG, 0, 1, 0},
 	{"alsa", &alsa, CONF_TYPE_FLAG, 0, 0, 1},
 	{"noalsa", &alsa, CONF_TYPE_FLAG, 0, 1, 0},
 	{"ni", &force_ni, CONF_TYPE_FLAG, 0, 0, 1},
 	{"noni", &force_ni, CONF_TYPE_FLAG, 0, 1, 0},
-	{"aid", &audio_id, CONF_TYPE_INT, 0, 0, 0},
-	{"vid", &video_id, CONF_TYPE_INT, 0, 0, 0},
+	{"aid", &audio_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
+	{"vid", &video_id, CONF_TYPE_INT, CONF_RANGE, 0, 256},
 	{"auds", &avi_header.audio_codec, CONF_TYPE_STRING, 0, 0, 0},
 	{"vids", &avi_header.video_codec, CONF_TYPE_STRING, 0, 0, 0},
-	{"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, 0, 0, 0},
-	{"fps", &force_fps, CONF_TYPE_FLOAT, 0, 0, 0},
-	{"afm", &audio_format, CONF_TYPE_INT, 0, 0, 0},
-	{"vcd", &vcd_track, CONF_TYPE_INT, 0, 0, 0},
-	{"pp", &divx_quality, CONF_TYPE_INT, 0, 0, 0},
-	{"br", &encode_bitrate, CONF_TYPE_INT, 0, 0, 0},
-	{"x", &screen_size_x, CONF_TYPE_INT, 0, 0, 0},
-	{"y", &screen_size_y, CONF_TYPE_INT, 0, 0, 0},
-	{"xy", &screen_size_xy, CONF_TYPE_INT, 0, 0, 0},
+	{"mc", &default_max_pts_correction, CONF_TYPE_FLOAT, CONF_RANGE, 0, 10},
+	{"fps", &force_fps, CONF_TYPE_FLOAT, CONF_MIN, 0, 0},
+	{"afm", &audio_format, CONF_TYPE_INT, CONF_RANGE, 1, 6},
+	{"vcd", &vcd_track, CONF_TYPE_INT, CONF_RANGE, 1, 99},
+	{"divxq", "Option -divxq has been renamed to -pp (postprocessing), use -pp !\n",
+            CONF_TYPE_PRINT, 0, 0, 0},
+	{"pp", &divx_quality, CONF_TYPE_INT, CONF_RANGE, 0, 63},
+	{"br", &encode_bitrate, CONF_TYPE_INT, CONF_RANGE, 10000, 10000000},
+	{"x", &screen_size_x, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
+	{"y", &screen_size_y, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
+	{"xy", &screen_size_xy, CONF_TYPE_INT, CONF_RANGE, 1, 4096},
 	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
 	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
 	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
 	{"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
-	{"v", &verbose, CONF_TYPE_INT, 0, 0, 0},
-	{"-help", cfg_func_help, CONF_TYPE_FUNC, CONF_NOCFG, 0, 0},
-	{"h", cfg_func_help, CONF_TYPE_FUNC, CONF_NOCFG, 0, 0},
+	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},
+	{"v", cfg_inc_verbose, CONF_TYPE_FUNC, 0, 0, 0},
+	{"-help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"help", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
+	{"h", help_text, CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 	{NULL, NULL, 0, 0, 0, 0}
 };