From c269e18813f0f08c957f5c490c02bf4fa9092343 Mon Sep 17 00:00:00 2001 From: Warren Dukes Date: Tue, 2 Nov 2004 02:03:00 +0000 Subject: now np's OSS stuff actually works git-svn-id: https://svn.musicpd.org/mpd/trunk@2459 09075e82-0dd4-0310-85a5-a0d7c8717e4f --- src/audioOutput_oss.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) (limited to 'src/audioOutput_oss.c') diff --git a/src/audioOutput_oss.c b/src/audioOutput_oss.c index f73e1a38a..c677c90d2 100644 --- a/src/audioOutput_oss.c +++ b/src/audioOutput_oss.c @@ -75,11 +75,13 @@ static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) { if(!bp) { int fd; - if(0 <= (fd = open("/dev/sound/dsp", O_WRONLY | O_NONBLOCK))) { + if(0 <= (fd = open("/dev/sound/dsp", O_WRONLY))) { od->device = strdup("/dev/sound/dsp"); + close(fd); } - else if(0 <= (fd = open("/dev/dsp", O_WRONLY | O_NONBLOCK))) { + else if(0 <= (fd = open("/dev/dsp", O_WRONLY))) { od->device = strdup("/dev/dsp"); + close(fd); } else { ERROR("Error trying to open default OSS device " @@ -89,7 +91,6 @@ static int oss_initDriver(AudioOutput * audioOutput, ConfigParam * param) { exit(EXIT_FAILURE); } - close(od->fd); od->fd = -1; return 0; -- cgit v1.2.3