Mercurial > mplayer.hg
changeset 23070:7bed5b94f253
Add Makefile variable for audio input that is enabled by V4L or radio capture.
| author | diego |
|---|---|
| date | Sun, 22 Apr 2007 20:43:28 +0000 |
| parents | 93948eb0280f |
| children | 643faafea423 |
| files | configure stream/Makefile |
| diffstat | 2 files changed, 4 insertions(+), 7 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Apr 22 20:32:15 2007 +0000 +++ b/configure Sun Apr 22 20:43:28 2007 +0000 @@ -6794,6 +6794,7 @@ fi fi if test "$_tv_v4l1" = yes ; then + _audio_input=yes _tv_v4l=yes _def_tv_v4l='#define HAVE_TV_V4L 1' _def_tv_v4l1='#define HAVE_TV_V4L1 1' @@ -6838,6 +6839,7 @@ _radio_capture=no fi if test "$_radio_capture" = yes ; then + _audio_input=yes _def_radio_capture="#define USE_RADIO_CAPTURE 1" else _def_radio_capture="#undef USE_RADIO_CAPTURE" @@ -7736,6 +7738,7 @@ TV_V4L1 = $_tv_v4l1 TV_V4L2 = $_tv_v4l2 TV_BSDBT848 = $_tv_bsdbt848 +AUDIO_INPUT = $_audio_input PVR = $_pvr VCD = $_vcd DVDREAD = $_dvdread
--- a/stream/Makefile Sun Apr 22 20:32:15 2007 +0000 +++ b/stream/Makefile Sun Apr 22 20:43:28 2007 +0000 @@ -54,13 +54,7 @@ SRCS_COMMON-$(VCD) += stream_vcd.c SRCS_COMMON-$(VSTREAM) += stream_vstream.c -#FIXME: These should have variables assigned in configure. -ifeq ($(TV_V4L),yes) -SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c -SRCS_COMMON-$(ALSA9) += ai_alsa.c -SRCS_COMMON-$(OSS) += ai_oss.c -endif -ifeq ($(RADIO_CAPTURE),yes) +ifeq ($(AUDIO_INPUT),yes) SRCS_COMMON-$(ALSA1X) += ai_alsa1x.c SRCS_COMMON-$(ALSA9) += ai_alsa.c SRCS_COMMON-$(OSS) += ai_oss.c