[Mplayer-cvslog] CVS: main cfg-common.h,1.101,1.102 configure,1.743,1.744

[Jindrich Makovicka CVS]

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

Modified Files:
	cfg-common.h configure 
Log Message:
v4l2 support

Index: cfg-common.h
===================================================================
RCS file: /cvsroot/mplayer/main/cfg-common.h,v
retrieving revision 1.101
retrieving revision 1.102
diff -u -r1.101 -r1.102
--- cfg-common.h	27 Jul 2003 22:20:15 -0000	1.101
+++ cfg-common.h	7 Aug 2003 12:24:07 -0000	1.102
@@ -291,6 +291,9 @@
 	{"channel", &tv_param_channel, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"chanlist", &tv_param_chanlist, CONF_TYPE_STRING, 0, 0, 0, NULL},
 	{"norm", &tv_param_norm, CONF_TYPE_STRING, 0, 0, 0, NULL},
+#ifdef HAVE_TV_V4L2
+	{"normid", &tv_param_normid, CONF_TYPE_INT, 0, 0, 0, NULL},
+#endif
 	{"width", &tv_param_width, CONF_TYPE_INT, 0, 0, 4096, NULL},
 	{"height", &tv_param_height, CONF_TYPE_INT, 0, 0, 4096, NULL},
 	{"input", &tv_param_input, CONF_TYPE_INT, 0, 0, 20, NULL},

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.743
retrieving revision 1.744
diff -u -r1.743 -r1.744
--- configure	6 Aug 2003 22:05:20 -0000	1.743
+++ configure	7 Aug 2003 12:24:07 -0000	1.744
@@ -151,6 +151,7 @@
   --enable-joystick      enable joystick support [disable]
   --disable-tv           disable TV Interface (tv/dvb grabbers) [enable]
   --disable-tv-v4l       disable Video4Linux TV Interface support [autodetect]
+  --disable-tv-v4l2      disable Video4Linux2 TV Interface support [autodetect]
   --disable-tv-bsdbt848  disable BSD BT848 Interface support [autodetect]
   --disable-edl          disable EDL (edit decision list) support [enable]
   --disable-rtc          disable RTC (/dev/rtc) on Linux [autodetect]
@@ -1093,6 +1094,7 @@
 _select=yes
 _tv=yes
 _tv_v4l=auto
+_tv_v4l2=auto
 _tv_bsdbt848=auto
 _edl=yes
 _network=yes
@@ -1271,6 +1273,8 @@
   --disable-tv-bsdbt848)	_tv_bsdbt848=no	;;
   --enable-tv-v4l)	_tv_v4l=yes	;;
   --disable-tv-v4l)	_tv_v4l=no	;;
+  --enable-tv-v4l2)	_tv_v4l2=yes	;;
+  --disable-tv-v4l2)	_tv_v4l2=no	;;
   --enable-fastmemcpy)	_fastmemcpy=yes	;;
   --disable-fastmemcpy)	_fastmemcpy=no	;;
   --enable-network)	_network=yes	;;
@@ -4902,6 +4906,28 @@
 echores "$_tv_v4l"
 
 
+echocheck "Video 4 Linux 2 TV interface"
+if test "$_tv_v4l2" = auto ; then
+ _tv_v4l2=no
+ if test "$_tv" = yes && linux ; then
+  for I in /dev/video /dev/video? ; do
+    if test -c $I ; then
+      _tv_v4l2=yes
+      break
+    fi
+  done
+ fi
+fi
+if test "$_tv_v4l2" = yes ; then
+  _def_tv_v4l2='#define HAVE_TV_V4L2 1'
+  _inputmodules="tv-v4l2 $_inputmodules"
+else
+  _noinputmodules="tv-v4l2 $_noinputmodules"
+  _def_tv_v4l='#undef HAVE_TV_V4L2'
+fi
+echores "$_tv_v4l2"
+
+
 echocheck "audio select()"
 if test "$_select" = no ; then
   _def_select='#undef HAVE_AUDIO_SELECT'
@@ -5778,6 +5804,9 @@
 
 /* Enable Video 4 Linux TV interface support */
 $_def_tv_v4l
+
+/* Enable Video 4 Linux 2 TV interface support */
+$_def_tv_v4l2
 
 /* Enable *BSD BrookTree TV interface support */
 $_def_tv_bsdbt848