Mercurial > mplayer.hg

changeset 24583:af12ba770230

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Fix compilation with enabled radio capture and disabled OSS audio.
author voroshil
date Mon, 24 Sep 2007 16:48:08 +0000
parents 6d5999a6b4e2
children 90896a8ab7b7
files stream/stream_radio.c
diffstat 1 files changed, 3 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/stream/stream_radio.c	Mon Sep 24 15:39:12 2007 +0000
+++ b/stream/stream_radio.c	Mon Sep 24 16:48:08 2007 +0000
@@ -857,12 +857,13 @@
         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*