From: Jaroslav Kysela <perex@perex.cz>
Date: Sat, 1 Mar 2003 11:20:18 +0000 (+0000)
Subject: Reverted back code for generic mix function
X-Git-Tag: v1.0.3~231
X-Git-Url: https://git.alsa-project.org/?a=commitdiff_plain;h=0b3b4b912d1106d38f10a50568622957f09e0165;p=alsa-lib.git

Reverted back code for generic mix function
---

diff --git a/src/pcm/pcm_dmix.c b/src/pcm/pcm_dmix.c
index d3d855d8..d8b7488e 100644
--- a/src/pcm/pcm_dmix.c
+++ b/src/pcm/pcm_dmix.c
@@ -641,9 +641,8 @@ static void mix_areas1(unsigned int size,
 
 	while (size-- > 0) {
 		sample = *src;
-		old_sample = *sum;
 		if (*dst == 0)
-			sample -= old_sample;
+			sample -= *sum;
 		*sum += sample;
 		do {
 			old_sample = *sum;
@@ -1375,7 +1374,7 @@ static int snd_pcm_dmix_initialize_slave(snd_pcm_dmix_t *dmix, snd_pcm_t *spcm,
 
 	ret = snd_pcm_sw_params(spcm, sw_params);
 	if (ret < 0) {
-		SNDERR("unable to install sw params");
+		SNDERR("unable to install sw params (please upgrade to 0.9.0rc8+ driver)");
 		return ret;
 	}