[Mplayer-cvslog] CVS: main cfg-common.h,1.2,1.3 cfg-mencoder.h,1.4,1.5 cfg-mplayer.h,1.100,1.101

[Alex Beregszaszi]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv16077

Modified Files:
	cfg-common.h cfg-mencoder.h cfg-mplayer.h 
Log Message:
added tv subsystem

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- cfg-common.h	3 Nov 2001 00:44:02 -0000	1.2
+++ cfg-common.h	9 Nov 2001 23:44:39 -0000	1.3
@@ -1,4 +1,4 @@
-
+#ifdef MAIN_CONF /* this will be included in conf[] */
 // ------------------------- stream options --------------------
 
 #ifdef USE_STREAM_CACHE
@@ -79,3 +79,28 @@
         {"oldpp", "MPlayer was compiled without opendivx library", CONF_TYPE_PRINT, CONF_NOCFG, 0, 0},
 #endif
 
+#ifdef USE_TV
+	{"tv", tvopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0},
+#endif
+
+#else
+
+#include "config.h"
+
+#ifdef USE_TV
+#include "libmpdemux/tv.h"
+
+struct config tvopts_conf[]={
+	{"on", &tv_param_on, CONF_TYPE_FLAG, 0, 0, 1},
+	{"driver", &tv_param_driver, CONF_TYPE_STRING, 0, 0, 0},
+	{"device", &tv_param_device, CONF_TYPE_STRING, 0, 0, 0},
+	{"freq", &tv_param_freq, CONF_TYPE_FLOAT, CONF_RANGE, 0, 2500000},
+	{"channel", &tv_param_channel, CONF_TYPE_STRING, 0, 0, 0},
+	{"norm", &tv_param_norm, CONF_TYPE_STRING, 0, 0, 0},
+	{"width", &tv_param_width, CONF_TYPE_INT, 0, 0, 4096},
+	{"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096},
+	{NULL, NULL, 0, 0, 0, 0}
+};
+#endif
+
+#endif

Index: cfg-mencoder.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mencoder.h,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- cfg-mencoder.h	3 Nov 2001 23:01:17 -0000	1.4
+++ cfg-mencoder.h	9 Nov 2001 23:44:39 -0000	1.5
@@ -2,6 +2,8 @@
  * config for cfgparser
  */
 
+#include "cfg-common.h"
+
 #ifdef USE_FAKE_MONO
 extern int fakemono; // defined in dec_audio.c
 #endif
@@ -71,7 +73,9 @@
 	{"divx4opts", divx4opts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0},
 	{"lameopts", lameopts_conf, CONF_TYPE_SUBCONFIG, 0, 0, 0},
 
+#define MAIN_CONF
 #include "cfg-common.h"
+#undef MAIN_CONF
 
 //	{"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1},
 	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},

Index: cfg-mplayer.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-mplayer.h,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- cfg-mplayer.h	3 Nov 2001 02:55:03 -0000	1.100
+++ cfg-mplayer.h	9 Nov 2001 23:44:39 -0000	1.101
@@ -2,6 +2,8 @@
  * config for cfgparser
  */
 
+#include "cfg-common.h"
+
 extern char *playlist_file;
 
 #ifdef HAVE_FBDEV
@@ -214,7 +216,9 @@
 	{"skin", &skinName, CONF_TYPE_STRING, 0, 0, 0},
 #endif
 
+#define MAIN_CONF
 #include "cfg-common.h"
+#undef MAIN_CONF
         
 	{"quiet", &quiet, CONF_TYPE_FLAG, 0, 0, 1},
 	{"verbose", &verbose, CONF_TYPE_INT, CONF_RANGE, 0, 100},