[MPlayer-cvslog] r19192 - in trunk: configure libmpdemux/Makefile libmpdemux/tv.c

[diego]

Author: diego
Date: Thu Jul 27 11:30:39 2006
New Revision: 19192

Modified:
   trunk/configure
   trunk/libmpdemux/Makefile
   trunk/libmpdemux/tv.c

Log:
Rename *v4l variable to *v4l1.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Jul 27 11:30:39 2006
@@ -217,7 +217,7 @@
   --disable-vm           disable support X video mode extensions [autodetect]
   --disable-xf86keysym   disable support for 'multimedia' keys [autodetect]
   --disable-tv           disable TV Interface (tv/dvb grabbers) [enable]
-  --disable-tv-v4l       disable Video4Linux TV Interface support [autodetect]
+  --disable-tv-v4l1      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-pvr          disable Video4Linux2/IVTV PVR support [autodetect]
@@ -1649,7 +1649,7 @@
 _win32=auto
 _select=yes
 _tv=yes
-_tv_v4l=auto
+_tv_v4l1=auto
 _tv_v4l2=auto
 _tv_bsdbt848=auto
 _pvr=auto
@@ -1884,8 +1884,8 @@
   --disable-tv)		_tv=no		;;
   --enable-tv-bsdbt848)	_tv_bsdbt848=yes	;;
   --disable-tv-bsdbt848)	_tv_bsdbt848=no	;;
-  --enable-tv-v4l)	_tv_v4l=yes	;;
-  --disable-tv-v4l)	_tv_v4l=no	;;
+  --enable-tv-v4l1)	_tv_v4l1=yes	;;
+  --disable-tv-v4l1)	_tv_v4l1=no	;;
   --enable-tv-v4l2)	_tv_v4l2=yes	;;
   --disable-tv-v4l2)	_tv_v4l2=no	;;
   --enable-pvr)  	_pvr=yes	;;
@@ -2966,7 +2966,7 @@
 else
   _res_comment="v4l, vo_gl, ao_alsa, ao_nas, ao_macosx, win32 loader disabled"
   _def_pthreads='#undef HAVE_PTHREADS'
-  _nas=no ; _tv_v4l=no ; _macosx=no
+  _nas=no ; _tv_v4l1=no ; _macosx=no
   if not mingw32 ; then
     _win32=no
   fi
@@ -6683,25 +6683,25 @@
 
 
 echocheck "Video 4 Linux TV interface"
-if test "$_tv_v4l" = auto ; then
- _tv_v4l=no
+if test "$_tv_v4l1" = auto ; then
+ _tv_v4l1=no
  if test "$_tv" = yes && linux ; then
   cat > $TMPC <<EOF
 #include <stdlib.h>
 #include <linux/videodev.h>
 int main(void) { return 0; }
 EOF
-  cc_check && _tv_v4l=yes
+  cc_check && _tv_v4l1=yes
  fi
 fi
-if test "$_tv_v4l" = yes ; then
-  _def_tv_v4l='#define HAVE_TV_V4L 1'
+if test "$_tv_v4l1" = yes ; then
+  _def_tv_v4l1='#define HAVE_TV_V4L1 1'
   _inputmodules="tv-v4l $_inputmodules"
 else
-  _noinputmodules="tv-v4l $_noinputmodules"
+  _noinputmodules="tv-v4l1 $_noinputmodules"
   _def_tv_v4l='#undef HAVE_TV_V4L'
 fi
-echores "$_tv_v4l"
+echores "$_tv_v4l1"
 
 
 echocheck "Video 4 Linux 2 TV interface"
@@ -7436,7 +7436,7 @@
 LIRC_LIB = $_ld_lirc
 LIRCC_LIB = $_ld_lircc
 TV = $_tv
-TV_V4L = $_tv_v4l
+TV_V4L1 = $_tv_v4l1
 TV_V4L2 = $_tv_v4l2
 TV_BSDBT848 = $_tv_bsdbt848
 PVR = $_pvr
@@ -7963,8 +7963,8 @@
 /* Enable TV Interface support */
 $_def_tv
 
-/* Enable Video 4 Linux TV interface support */
-$_def_tv_v4l
+/* Enable Video 4 Linux 1 TV interface support */
+$_def_tv_v4l1
 
 /* Enable Video 4 Linux 2 TV interface support */
 $_def_tv_v4l2

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Thu Jul 27 11:30:39 2006
@@ -79,7 +79,7 @@
     SRCS += stream_pvr.c
     endif
   endif
-  ifeq ($(TV_V4L),yes)
+  ifeq ($(TV_V4L1),yes)
   SRCS += tvi_v4l.c audio_in.c
   endif
   ifneq ($(TV_V4L)$(TV_V4L2),)

Modified: trunk/libmpdemux/tv.c
==============================================================================
--- trunk/libmpdemux/tv.c	(original)
+++ trunk/libmpdemux/tv.c	Thu Jul 27 11:30:39 2006
@@ -56,7 +56,7 @@
 float tv_param_fps = -1.0;
 char **tv_param_channels = NULL;
 int tv_param_audio_id = 0;
-#if defined(HAVE_TV_V4L) || defined(HAVE_TV_V4L2)
+#if defined(HAVE_TV_V4L1) || defined(HAVE_TV_V4L2)
 int tv_param_amode = -1;
 int tv_param_volume = -1;
 int tv_param_bass = -1;
@@ -237,7 +237,7 @@
     }
 #endif
 
-#ifdef HAVE_TV_V4L
+#ifdef HAVE_TV_V4L1
     if ( tv_param_mjpeg )
     {
       /* set width to expected value */
@@ -638,7 +638,7 @@
 {
     if (!strcmp(tv_param_driver, "dummy"))
 	return tvi_init_dummy(tv_param_device);
-#ifdef HAVE_TV_V4L
+#ifdef HAVE_TV_V4L1
     if (!strcmp(tv_param_driver, "v4l"))
 	return tvi_init_v4l(tv_param_device, tv_param_adevice);
 #endif