[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-core-devel
Subject:    Fix for Bug 73461 - ok to commit?
From:       Bernhard Rosenkraenzer <bero () arklinux ! org>
Date:       2004-01-27 13:10:10
Message-ID: Pine.LNX.4.58.0401271406050.1949 () dot ! kde ! org
[Download RAW message or body]

I've fixed bug #73461 and its various duplicates, which seems to affect 
quite a few people (at the very least everyone using the ALSA 1.0.1 driver 
for intel8x0 sound chips).

Ok to commit in the 1.2 branch?

LLaP
bero

-- 
Ark Linux - Linux for the masses
http://www.arklinux.org/

Redistribution and processing of this message is subject to
http://www.arklinux.org/terms.php
["arts-20040127-cpu-overload.patch" (TEXT/PLAIN)]

--- arts/flow/audioioalsa9.cc.ark	2004-01-27 13:51:36.000000000 +0100
+++ arts/flow/audioioalsa9.cc	2004-01-27 14:01:08.000000000 +0100
@@ -275,13 +275,21 @@
 		return audio_write_fd;
 
 	case autoDetect:
+	{
 		/*
 		 * that the ALSA driver could be compiled doesn't say anything
 		 * about whether it will work (the user might be using an OSS
-		 * kernel driver) so we'll use a value less than the OSS one
-		 * here, because OSS will most certainly work (ALSA's OSS emu)
+		 * kernel driver).
+		 * If we can open the device, it'll work - and we'll have to use
+		 * a higher number than OSS to avoid buggy OSS emulation being used.
 		 */
-		return 5;
+		int card = -1;
+		if (snd_card_next(&card) < 0 || card < 0) {
+			// No ALSA drivers in use...
+			return 0;
+		}
+		return 11;
+	}
 
 	default:
 		return param(p);


[prev in list] [next in list] [prev in thread] [next in thread]