diff options
-rw-r--r-- | libmpdemux/ai_alsa.c | 6 | ||||
-rw-r--r-- | libmpdemux/ai_alsa1x.c | 6 | ||||
-rw-r--r-- | libmpdemux/ai_oss.c | 15 | ||||
-rw-r--r-- | libmpdemux/audio_in.c | 10 |
4 files changed, 28 insertions, 9 deletions
diff --git a/libmpdemux/ai_alsa.c b/libmpdemux/ai_alsa.c index 668e43679f..a7a8a5815d 100644 --- a/libmpdemux/ai_alsa.c +++ b/libmpdemux/ai_alsa.c @@ -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" diff --git a/libmpdemux/ai_alsa1x.c b/libmpdemux/ai_alsa1x.c index 668e43679f..a7a8a5815d 100644 --- a/libmpdemux/ai_alsa1x.c +++ b/libmpdemux/ai_alsa1x.c @@ -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" diff --git a/libmpdemux/ai_oss.c b/libmpdemux/ai_oss.c index 9bc2170580..6924c17948 100644 --- a/libmpdemux/ai_oss.c +++ b/libmpdemux/ai_oss.c @@ -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" diff --git a/libmpdemux/audio_in.c b/libmpdemux/audio_in.c index 264a7bc4b4..5fdfa9f6f8 100644 --- a/libmpdemux/audio_in.c +++ b/libmpdemux/audio_in.c @@ -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 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) return -1; } } + +#endif |