RepoMirrors
/
mpv
mirror of https://github.com/mpv-player/mpv
1
0
Fork 0
Code Issues Releases Wiki Activity

Introduce general V4L variable/define. 

git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@19194 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
diego 2006-07-27 09:34:32 +00:00
parent 68ce26863c
commit 51a2db3628
4 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
configure vendored
View File

@ -6695,6 +6695,8 @@ EOF
fi fi
fi fi
if test "$_tv_v4l1" = yes ; then 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' _def_tv_v4l1='#define HAVE_TV_V4L1 1'
_inputmodules="tv-v4l $_inputmodules" _inputmodules="tv-v4l $_inputmodules"
else else
@ -6718,6 +6720,8 @@ EOF
fi fi
fi fi
if test "$_tv_v4l2" = yes ; then 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' _def_tv_v4l2='#define HAVE_TV_V4L2 1'
_inputmodules="tv-v4l2 $_inputmodules" _inputmodules="tv-v4l2 $_inputmodules"
else else
@ -7436,6 +7440,7 @@ TERMCAP_LIB = $_ld_termcap
LIRC_LIB = $_ld_lirc LIRC_LIB = $_ld_lirc
LIRCC_LIB = $_ld_lircc LIRCC_LIB = $_ld_lircc
TV = $_tv TV = $_tv
TV_V4L = $_tv_v4l
TV_V4L1 = $_tv_v4l1 TV_V4L1 = $_tv_v4l1
TV_V4L2 = $_tv_v4l2 TV_V4L2 = $_tv_v4l2
TV_BSDBT848 = $_tv_bsdbt848 TV_BSDBT848 = $_tv_bsdbt848
@ -7963,6 +7968,9 @@ $_def_nas
/* Enable TV Interface support */ /* Enable TV Interface support */
$_def_tv $_def_tv
/* Enable Video 4 Linux TV interface support */
$_def_tv_v4l
/* Enable Video 4 Linux 1 TV interface support */ /* Enable Video 4 Linux 1 TV interface support */
$_def_tv_v4l1 $_def_tv_v4l1

2
libmpdemux/Makefile
View File

@ -82,7 +82,7 @@ SRCS += tv.c frequencies.c tvi_dummy.c
ifeq ($(TV_V4L1),yes) ifeq ($(TV_V4L1),yes)
SRCS += tvi_v4l.c audio_in.c SRCS += tvi_v4l.c audio_in.c
endif endif
ifneq ($(TV_V4L)$(TV_V4L2),) ifeq ($(TV_V4L),yes)
ifeq ($(ALSA1X),yes) ifeq ($(ALSA1X),yes)
SRCS += ai_alsa1x.c SRCS += ai_alsa1x.c
endif endif

2
libmpdemux/tv.c
View File

@ -56,7 +56,7 @@ int tv_param_outfmt = -1;
float tv_param_fps = -1.0; float tv_param_fps = -1.0;
char **tv_param_channels = NULL; char **tv_param_channels = NULL;
int tv_param_audio_id = 0; 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_amode = -1;
int tv_param_volume = -1; int tv_param_volume = -1;
int tv_param_bass = -1; int tv_param_bass = -1;

2
libmpdemux/tv.h
View File

@ -28,7 +28,7 @@ extern int tv_param_noaudio;
extern int tv_param_immediate; extern int tv_param_immediate;
extern int tv_param_audiorate; extern int tv_param_audiorate;
extern int tv_param_audio_id; 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_amode;
extern int tv_param_volume; extern int tv_param_volume;
extern int tv_param_bass; extern int tv_param_bass;