diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-27 09:34:32 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2006-07-27 09:34:32 +0000 |
| commit | 51a2db362844462a0ffffd143e1b199a1d3ff8d5 (patch) | |
| tree | 1d15881f1117d49e4e3ae15e61707b938a152e31 | |
| parent | 68ce26863c9d6d480c07c4d6c31e08f9658b5ee0 (diff) | |
| download | mpv-51a2db362844462a0ffffd143e1b199a1d3ff8d5.tar.bz2 mpv-51a2db362844462a0ffffd143e1b199a1d3ff8d5.tar.xz | |
Introduce general V4L variable/define.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19194 b3059339-0415-0410-9bf9-f77b7e298cf2
| -rwxr-xr-x | configure | 8 | ||||
| -rw-r--r-- | libmpdemux/Makefile | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.c | 2 | ||||
| -rw-r--r-- | libmpdemux/tv.h | 2 |
4 files changed, 11 insertions, 3 deletions
@@ -6695,6 +6695,8 @@ EOF 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 @@ EOF 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 @@ TERMCAP_LIB = $_ld_termcap 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 @@ $_def_nas /* 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 diff --git a/libmpdemux/Makefile b/libmpdemux/Makefile index ffd55a1405..fb8870d537 100644 --- a/libmpdemux/Makefile +++ b/libmpdemux/Makefile @@ -82,7 +82,7 @@ SRCS += tv.c frequencies.c tvi_dummy.c 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 diff --git a/libmpdemux/tv.c b/libmpdemux/tv.c index 1fa0b02f17..74ac7e39fc 100644 --- a/libmpdemux/tv.c +++ b/libmpdemux/tv.c @@ -56,7 +56,7 @@ int tv_param_outfmt = -1; 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; diff --git a/libmpdemux/tv.h b/libmpdemux/tv.h index 31f7821dbd..6a4f03b98d 100644 --- a/libmpdemux/tv.h +++ b/libmpdemux/tv.h @@ -28,7 +28,7 @@ extern int tv_param_noaudio; 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; |