diff cfg-mplayer.h @ 448:198b46b739d8

qrva eletbe nem kene cvs-t elbaszni inkabb ne nyuljatok hozza baz+
author arpi_esp
date Sun, 15 Apr 2001 20:31:58 +0000
parents fe56e5a1dc05
children cc7e37b09748
line wrap: on
line diff
--- a/cfg-mplayer.h	Sun Apr 15 19:35:34 2001 +0000
+++ b/cfg-mplayer.h	Sun Apr 15 20:31:58 2001 +0000
@@ -6,76 +6,78 @@
 extern char *fb_dev_name;
 extern char *fb_mode_cfgfile;
 extern char *fb_mode_name;
-extern int fb_mode_depth;
+extern char *monitor_hfreq_str;
+extern char *monitor_vfreq_str;
+extern char *monitor_dotclock_str;
 #endif
 
 struct config conf[]={
-        /* name, pointer, type, flags, min, max */
-        {"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
-        {"o", "Option -o has been renamed to -vo (video-out), use -vo !\n",
+	/* name, pointer, type, flags, min, max */
+	{"include", cfg_include, CONF_TYPE_FUNC_PARAM, 0, 0, 0}, /* this must be the first!!! */
+	{"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},
-        {"mixer", &mixer_device, CONF_TYPE_STRING, 0, 0, 0},
-        {"master", &mixer_usemaster, CONF_TYPE_FLAG, 0, 0, 1},
+	{"vo", &video_driver, CONF_TYPE_STRING, 0, 0, 0},
+	{"dsp", &dsp, CONF_TYPE_STRING, 0, 0, 0},
 #ifdef HAVE_FBDEV
-        {"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
-        {"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0},
-        {"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0},
-//        {"fbdepth", &fb_mode_depth, CONF_TYPE_INT, CONF_RANGE, 15, 32},
+	{"fb", &fb_dev_name, CONF_TYPE_STRING, 0, 0, 0},
+	{"fbmode", &fb_mode_name, CONF_TYPE_STRING, 0, 0, 0},
+	{"fbmodeconfig", &fb_mode_cfgfile, CONF_TYPE_STRING, 0, 0, 0},
+	{"monitor_hfreq", &monitor_hfreq_str, CONF_TYPE_STRING, 0, 0, 0},
+	{"monitor_vfreq", &monitor_vfreq_str, CONF_TYPE_STRING, 0, 0, 0},
+	{"monitor_dotclock", &monitor_dotclock_str, CONF_TYPE_STRING, 0, 0, 0},
 #endif
-        {"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
-        {"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
-        {"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
-        {"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
-        {"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
-        {"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.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, 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, 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, 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, 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",
+	{"encode", &encode_name, CONF_TYPE_STRING, 0, 0, 0},
+	{"sub", &sub_name, CONF_TYPE_STRING, 0, 0, 0},
+	{"subdelay", &sub_delay, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
+	{"subfps", &sub_fps, CONF_TYPE_FLOAT, 0, 0.0, 10.0},
+	{"font", &font_name, CONF_TYPE_STRING, 0, 0, 0},
+	{"ffactor", &font_factor, CONF_TYPE_FLOAT, CONF_RANGE, 0.0, 10.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, 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, 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, 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, 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},
+	{"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},
+	{"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},
         {"vm", &vidmode, CONF_TYPE_FLAG, 0, 0, 1},
         {"novm", &vidmode, CONF_TYPE_FLAG, 0, 1, 0},
-        {"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
-        {"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
+	{"fs", &fullscreen, CONF_TYPE_FLAG, 0, 0, 1},
+	{"nofs", &fullscreen, CONF_TYPE_FLAG, 0, 1, 0},
         {"zoom", &softzoom, CONF_TYPE_FLAG, 0, 0, 1},
         {"nozoom", &softzoom, CONF_TYPE_FLAG, 0, 1, 0},
-
+       
         {"bpp", &vo_dbpp, CONF_TYPE_INT, CONF_RANGE, 0, 32},
-
-        {"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
-        {"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
-        {"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}
+	
+	{"idx", &no_index, CONF_TYPE_FLAG, 0, 1, 0},
+	{"noidx", &no_index, CONF_TYPE_FLAG, 0, 0, 1},
+	{"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}
 };