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

[diego]

Author: diego
Date: Thu Jul 27 11:34:32 2006
New Revision: 19194

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

Log:
Introduce general V4L variable/define.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Thu Jul 27 11:34:32 2006
@@ -6695,6 +6695,8 @@
  fi
 fi
 if test "$_tv_v4l1" = yes ; then
+  _tv_v4l=yes
+  _def_tv_v4l='#define HAVE_TV_V4L 1'
   _def_tv_v4l1='#define HAVE_TV_V4L1 1'
   _inputmodules="tv-v4l $_inputmodules"
 else
@@ -6718,6 +6720,8 @@
  fi
 fi
 if test "$_tv_v4l2" = yes ; then
+  _tv_v4l=yes
+  _def_tv_v4l='#define HAVE_TV_V4L 1'
   _def_tv_v4l2='#define HAVE_TV_V4L2 1'
   _inputmodules="tv-v4l2 $_inputmodules"
 else
@@ -7436,6 +7440,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
@@ -7963,6 +7968,9 @@
 /* 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
 

Modified: trunk/libmpdemux/Makefile
==============================================================================
--- trunk/libmpdemux/Makefile	(original)
+++ trunk/libmpdemux/Makefile	Thu Jul 27 11:34:32 2006
@@ -82,7 +82,7 @@
   ifeq ($(TV_V4L1),yes)
   SRCS += tvi_v4l.c audio_in.c
   endif
-  ifneq ($(TV_V4L)$(TV_V4L2),)
+  ifeq ($(TV_V4L),yes)
     ifeq ($(ALSA1X),yes)
      SRCS += ai_alsa1x.c
     endif

Modified: trunk/libmpdemux/tv.c
==============================================================================
--- trunk/libmpdemux/tv.c	(original)
+++ trunk/libmpdemux/tv.c	Thu Jul 27 11:34:32 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_V4L1) || defined(HAVE_TV_V4L2)
+#if defined(HAVE_TV_V4L)
 int tv_param_amode = -1;
 int tv_param_volume = -1;
 int tv_param_bass = -1;

Modified: trunk/libmpdemux/tv.h
==============================================================================
--- trunk/libmpdemux/tv.h	(original)
+++ trunk/libmpdemux/tv.h	Thu Jul 27 11:34:32 2006
@@ -28,7 +28,7 @@
 extern int tv_param_immediate;
 extern int tv_param_audiorate;
 extern int tv_param_audio_id;
-#if defined(HAVE_TV_V4L1) || defined(HAVE_TV_V4L2)
+#if defined(HAVE_TV_V4L)
 extern int tv_param_amode;
 extern int tv_param_volume;
 extern int tv_param_bass;