[Mplayer-cvslog] CVS: main/libmpdemux ai_alsa.c,1.2,1.3 ai_oss.c,1.3,1.4 audio_in.c,1.2,1.3

[Arpi of Ize]

Update of /cvsroot/mplayer/main/libmpdemux
In directory mail:/var/tmp.root/cvs-serv8176

Modified Files:
	ai_alsa.c ai_oss.c audio_in.c 
Log Message:
audio in layer is used only bu tvi_v4l, don't compile for others.


Index: ai_alsa.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ai_alsa.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ai_alsa.c	22 Aug 2002 23:05:58 -0000	1.2
+++ ai_alsa.c	31 Aug 2002 22:41:29 -0000	1.3
@@ -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"

Index: ai_oss.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/ai_oss.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ai_oss.c	26 Aug 2002 17:20:17 -0000	1.3
+++ ai_oss.c	31 Aug 2002 22:41:29 -0000	1.4
@@ -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"

Index: audio_in.c
===================================================================
RCS file: /cvsroot/mplayer/main/libmpdemux/audio_in.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- audio_in.c	22 Aug 2002 23:05:58 -0000	1.2
+++ audio_in.c	31 Aug 2002 22:41:29 -0000	1.3
@@ -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