Mercurial > mplayer.hg

diff stream/audio_in.h @ 27390:9d95dc936e66
Introduce CONFIG_ALSA preprocessor directive for ALSA 0.9 and 1.x. Use it in all the places that checked for either ALSA 0.9 or 1.x.
author: diego
date: Wed, 06 Aug 2008 23:19:29 +0000
parents: eb7bdbd98210
children: 0f1b5b68af32
--- a/stream/audio_in.h	Wed Aug 06 07:50:44 2008 +0000
+++ b/stream/audio_in.h	Wed Aug 06 23:19:29 2008 +0000
@@ -6,7 +6,7 @@
 
 #include "config.h"
 
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 #include <alsa/asoundlib.h>
 
 typedef struct {
@@ -43,7 +43,7 @@
     int bytes_per_sample;
     int samplesize;
     
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
     ai_alsa_t alsa;
 #endif
 #ifdef CONFIG_OSS_AUDIO
@@ -60,7 +60,7 @@
 int audio_in_start_capture(audio_in_t *ai);
 int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer);
 
-#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X)
+#ifdef CONFIG_ALSA
 int ai_alsa_setup(audio_in_t *ai);
 int ai_alsa_init(audio_in_t *ai);
 int ai_alsa_xrun(audio_in_t *ai);