diff options
| author | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-06 23:19:29 +0000 |
|---|---|---|
| committer | diego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2008-08-06 23:19:29 +0000 |
| commit | 024b6efdf1439c2573350048a433d0324dcee349 (patch) | |
| tree | 1b6f2ddfb80e8caaed1338601dc0036d06347070 /stream/audio_in.h | |
| parent | 64877d97ad5d2803a385f628bcc4033932e8e5b5 (diff) | |
| download | mpv-024b6efdf1439c2573350048a433d0324dcee349.tar.bz2 mpv-024b6efdf1439c2573350048a433d0324dcee349.tar.xz | |
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.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27422 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream/audio_in.h')
| -rw-r--r-- | stream/audio_in.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/audio_in.h b/stream/audio_in.h index ee22571234..855d613964 100644 --- a/stream/audio_in.h +++ b/stream/audio_in.h @@ -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 @@ typedef struct 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_uninit(audio_in_t *ai); 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); |