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/stream_radio.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/stream_radio.c')
| -rw-r--r-- | stream/stream_radio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/stream/stream_radio.c b/stream/stream_radio.c index 3002ee38c7..9792fb142c 100644 --- a/stream/stream_radio.c +++ b/stream/stream_radio.c @@ -715,7 +715,7 @@ static int 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: //device opened in non-blocking mode ret = snd_pcm_readi(ai->alsa.handle, buffer, ai->alsa.chunk_size); @@ -836,7 +836,7 @@ static int init_audio(radio_priv_t *priv) priv->do_capture=1; mp_msg(MSGT_RADIO,MSGL_V,MSGTR_RADIO_CaptureStarting); -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA while ((tmp = strrchr(priv->radio_param->adevice, '='))){ tmp[0] = ':'; //adevice option looks like ALSA device name. Switching to ALSA @@ -862,7 +862,7 @@ static int init_audio(radio_priv_t *priv) if(is_oss) ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0); #endif -#if defined(CONFIG_ALSA9) || defined(CONFIG_ALSA1X) +#ifdef CONFIG_ALSA if(!is_oss) snd_pcm_nonblock(priv->audio_in.alsa.handle,1); #endif |