summaryrefslogtreecommitdiffstats
path: root/stream
diff options
context:
space:
mode:
authorvoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-24 16:48:08 +0000
committervoroshil <voroshil@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-09-24 16:48:08 +0000
commit2312ca9e706e03f8f70a8c3c0cc69e88701559a1 (patch)
tree601c003ca1c922cad2ca0a20343602e0754dd393 /stream
parent6be56dbf2e72e12f99c2524468f0a8205efb2574 (diff)
downloadmpv-2312ca9e706e03f8f70a8c3c0cc69e88701559a1.tar.bz2
mpv-2312ca9e706e03f8f70a8c3c0cc69e88701559a1.tar.xz
Fix compilation with enabled radio capture and disabled OSS audio.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@24603 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'stream')
-rw-r--r--stream/stream_radio.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/stream/stream_radio.c b/stream/stream_radio.c
index 3e46148528..5f7097ef17 100644
--- a/stream/stream_radio.c
+++ b/stream/stream_radio.c
@@ -857,12 +857,13 @@ static int init_audio(radio_priv_t *priv)
mp_msg(MSGT_RADIO, MSGL_ERR, MSGTR_RADIO_AudioInSetupFailed, strerror(errno));
return STREAM_ERROR;
}
+#ifdef USE_OSS_AUDIO
if(is_oss)
ioctl(priv->audio_in.oss.audio_fd, SNDCTL_DSP_NONBLOCK, 0);
+#endif
#if defined(HAVE_ALSA9) || defined(HAVE_ALSA1X)
- else{
+ if(!is_oss)
snd_pcm_nonblock(priv->audio_in.alsa.handle,1);
- }
#endif
priv->audio_buffer_size = seconds*priv->audio_in.samplerate*priv->audio_in.channels*