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.c | |
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.c')
-rw-r--r-- | stream/audio_in.c | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/stream/audio_in.c b/stream/audio_in.c index 2a988ef84f..45b1e9b79d 100644 --- a/stream/audio_in.c +++ b/stream/audio_in.c @@ -23,7 +23,7 @@ int audio_in_init(audio_in_t *ai, int type) ai->samplesize = -1; switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->alsa.handle = NULL; ai->alsa.log = NULL; @@ -45,7 +45,7 @@ int audio_in_setup(audio_in_t *ai) { switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai_alsa_init(ai) < 0) return -1; ai->setup = 1; @@ -65,7 +65,7 @@ int audio_in_setup(audio_in_t *ai) int audio_in_set_samplerate(audio_in_t *ai, int rate) { switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->req_samplerate = rate; if (!ai->setup) return 0; @@ -87,7 +87,7 @@ int audio_in_set_samplerate(audio_in_t *ai, int rate) int audio_in_set_channels(audio_in_t *ai, int channels) { switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ai->req_channels = channels; if (!ai->setup) return 0; @@ -108,12 +108,12 @@ int audio_in_set_channels(audio_in_t *ai, int channels) int audio_in_set_device(audio_in_t *ai, char *device) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA int i; #endif if (ai->setup) return -1; switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai->alsa.device) free(ai->alsa.device); ai->alsa.device = strdup(device); @@ -138,7 +138,7 @@ int audio_in_uninit(audio_in_t *ai) { if (ai->setup) { switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: if (ai->alsa.log) snd_output_close(ai->alsa.log); @@ -162,7 +162,7 @@ int audio_in_uninit(audio_in_t *ai) int audio_in_start_capture(audio_in_t *ai) { switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: return snd_pcm_start(ai->alsa.handle); #endif @@ -180,7 +180,7 @@ int audio_in_read_chunk(audio_in_t *ai, unsigned char *buffer) int ret; switch (ai->type) { -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA case AUDIO_IN_ALSA: ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); if (ret != ai->alsa.chunk_size) { |