From 569136db750eb40fdd882ae459ef01c7ce4e9e58 Mon Sep 17 00:00:00 2001
From: Sven Hesse
Date: Sat, 27 Jan 2007 17:32:54 +0000
Subject: Changed ProtrackerStream to inherit from Paula, unifying the mixing

svn-id: r25226
---
 sound/mods/paula.cpp | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

(limited to 'sound/mods/paula.cpp')

diff --git a/sound/mods/paula.cpp b/sound/mods/paula.cpp
index 33a8dd7c2a..c71d6642a3 100644
--- a/sound/mods/paula.cpp
+++ b/sound/mods/paula.cpp
@@ -67,10 +67,6 @@ int Paula::readBuffer(int16 *buffer, const int numSamples) {
 	int16 *p;
 	int8 *data;
 
-// FIXME: Could this code be unified/merged with ProtrackerStream::generateSound?
-// They look very similar. Maybe one could be rewritten to 
-// use the other?
-	
 	Common::StackLock lock(_mutex);
 
 	memset(buffer, 0, numSamples * 2);
@@ -96,7 +92,7 @@ int Paula::readBuffer(int16 *buffer, const int numSamples) {
 			data = _voice[voice].data;
 			p = buffer;
 
-			_voice[voice].volume &= 0x3F;
+			_voice[voice].volume = MIN((byte) 0x40, _voice[voice].volume);
 			if ((_voice[voice].lengthRepeat > 2) &&
 					((int)(offset + nSamples * rate) >= sLen)) {
 				int neededSamples = nSamples;
-- 
cgit v1.2.3