summaryrefslogtreecommitdiffstats
path: root/libmpdemux
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-31 22:41:29 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-08-31 22:41:29 +0000
commit74dbe1d8385a54ec1bb98917a1dd46fed153cf31 (patch)
treed5b5401677013fa9ef409f7c3b094e65985e05e1 /libmpdemux
parentb9a16d87f3f9194e2f2bea7eb8e19fe64ca70bef (diff)
downloadmpv-74dbe1d8385a54ec1bb98917a1dd46fed153cf31.tar.bz2
mpv-74dbe1d8385a54ec1bb98917a1dd46fed153cf31.tar.xz
audio in layer is used only bu tvi_v4l, don't compile for others.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@7214 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'libmpdemux')
-rw-r--r--libmpdemux/ai_alsa.c6
-rw-r--r--libmpdemux/ai_alsa1x.c6
-rw-r--r--libmpdemux/ai_oss.c15
-rw-r--r--libmpdemux/audio_in.c10
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