Mercurial > mplayer.hg
changeset 7213:13fcab6fde41
audio in layer is used only bu tvi_v4l, don't compile for others.
| author | arpi |
|---|---|
| date | Sat, 31 Aug 2002 22:41:29 +0000 |
| parents | 0d3af3bfab23 |
| children | f335b0da380c |
| files | libmpdemux/ai_alsa.c libmpdemux/ai_alsa1x.c libmpdemux/ai_oss.c libmpdemux/audio_in.c |
| diffstat | 4 files changed, 28 insertions(+), 9 deletions(-) [+] |
line wrap: on
line diff
--- a/libmpdemux/ai_alsa.c Sat Aug 31 22:29:28 2002 +0000 +++ b/libmpdemux/ai_alsa.c Sat Aug 31 22:41:29 2002 +0000 @@ -1,6 +1,10 @@ +#include <stdio.h> +#include <stdlib.h> + #include "config.h" -#ifdef HAVE_ALSA9 +#if defined(USE_TV) && defined(HAVE_TV_V4L) && defined(HAVE_ALSA9) + #include <alsa/asoundlib.h> #include "audio_in.h" #include "mp_msg.h"
--- a/libmpdemux/ai_alsa1x.c Sat Aug 31 22:29:28 2002 +0000 +++ b/libmpdemux/ai_alsa1x.c Sat Aug 31 22:41:29 2002 +0000 @@ -1,6 +1,10 @@ +#include <stdio.h> +#include <stdlib.h> + #include "config.h" -#ifdef HAVE_ALSA9 +#if defined(USE_TV) && defined(HAVE_TV_V4L) && defined(HAVE_ALSA9) + #include <alsa/asoundlib.h> #include "audio_in.h" #include "mp_msg.h"
--- a/libmpdemux/ai_oss.c Sat Aug 31 22:29:28 2002 +0000 +++ b/libmpdemux/ai_oss.c Sat Aug 31 22:41:29 2002 +0000 @@ -1,6 +1,15 @@ +#include <stdio.h> +#include <stdlib.h> + #include "config.h" -#ifdef USE_OSS_AUDIO +#if defined(USE_TV) && defined(HAVE_TV_V4L) && defined(USE_OSS_AUDIO) + +#include <string.h> /* strerror */ +#include <fcntl.h> +#include <errno.h> +#include <sys/ioctl.h> + #ifdef HAVE_SYS_SOUNDCARD_H #include <sys/soundcard.h> #else @@ -10,10 +19,6 @@ #include <linux/soundcard.h> #endif #endif -#include <fcntl.h> -#include <errno.h> -#include <sys/ioctl.h> -#include <string.h> /* strerror */ #include "audio_in.h" #include "mp_msg.h"
--- a/libmpdemux/audio_in.c Sat Aug 31 22:29:28 2002 +0000 +++ b/libmpdemux/audio_in.c Sat Aug 31 22:41:29 2002 +0000 @@ -1,8 +1,12 @@ +#include <stdio.h> +#include <stdlib.h> + #include "config.h" + +#if defined(USE_TV) && defined(HAVE_TV_V4L) + #include "audio_in.h" #include "mp_msg.h" -#include <stdio.h> -#include <stdlib.h> #include <string.h> #include <errno.h> @@ -190,3 +194,5 @@ return -1; } } + +#endif