From f83e779ee4c356947770069f6ccc993d23e981e3 Mon Sep 17 00:00:00 2001 From: diego Date: Tue, 5 Aug 2008 16:32:47 +0000 Subject: Rename some audio-output-related preprocessor directives. Switch them from a HAVE_ prefix to a CONFIG_ prefix. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@27419 b3059339-0415-0410-9bf9-f77b7e298cf2 --- stream/audio_in.c | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'stream/audio_in.c') diff --git a/stream/audio_in.c b/stream/audio_in.c index 2b2497a8d9..2a988ef84f 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) int i; #endif if (ai->setup) return -1; switch (ai->type) { -#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) 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(HAVE_ALSA9) || defined(HAVE_ALSA1X) +#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) case AUDIO_IN_ALSA: ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); if (ret != ai->alsa.chunk_size) { -- cgit v1.2.3