Mercurial > mplayer.hg
comparison stream/stream_radio.c @ 24583:af12ba770230
Fix compilation with enabled radio capture and disabled OSS audio.
| author | voroshil |
|---|---|
| date | Mon, 24 Sep 2007 16:48:08 +0000 |
| parents | d261f5109660 |
| children | 833520054ee5 |
comparison
equal
deleted
inserted
replaced
| 24582:6d5999a6b4e2 | 24583:af12ba770230 |
|---|---|
| 855 | 855 |
| 856 if (audio_in_setup(&priv->audio_in) < 0) { | 856 if (audio_in_setup(&priv->audio_in) < 0) { |
| 857 mp_msg(MSGT_RADIO, MSGL_ERR, MSGTR_RADIO_AudioInSetupFailed, strerror(errno)); | 857 mp_msg(MSGT_RADIO, MSGL_ERR, MSGTR_RADIO_AudioInSetupFailed, strerror(errno)); |
| 858 return STREAM_ERROR; | 858 return STREAM_ERROR; |
| 859 } | 859 } |
| 860 #ifdef USE_OSS_AUDIO | |
| 860 if(is_oss) | 861 if(is_oss) |
| 861 ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0); | 862 ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0); |
| 863 #endif | |
| 862 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) | 864 #if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X) |
| 863 else{ | 865 if(!is_oss) |
| 864 snd_pcm_nonblock(priv->audio_in.alsa.handle,1); | 866 snd_pcm_nonblock(priv->audio_in.alsa.handle,1); |
| 865 } | |
| 866 #endif | 867 #endif |
| 867 | 868 |
| 868 priv->audio_buffer_size = seconds*priv->audio_in.samplerate*priv->audio_in.channels* | 869 priv->audio_buffer_size = seconds*priv->audio_in.samplerate*priv->audio_in.channels* |
| 869 priv->audio_in.bytes_per_sample+priv->audio_in.blocksize; | 870 priv->audio_in.bytes_per_sample+priv->audio_in.blocksize; |
| 870 if (priv->audio_buffer_size < 256*priv->audio_in.blocksize) | 871 if (priv->audio_buffer_size < 256*priv->audio_in.blocksize) |