[Scummvm-cvs-logs] CVS: scummvm/scumm imuse_digi.cpp,1.37,1.38 sound.cpp,1.217,1.218

[Pawel Kolodziejski]

Update of /cvsroot/scummvm/scummvm/scumm
In directory sc8-pr-cvs1:/tmp/cvs-serv1032/scumm

Modified Files:
	imuse_digi.cpp sound.cpp 
Log Message:
changed sounds volume to original volume level, and fixed sounds in bass intro

Index: imuse_digi.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/imuse_digi.cpp,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -d -r1.37 -r1.38
--- imuse_digi.cpp	1 Sep 2003 13:43:21 -0000	1.37
+++ imuse_digi.cpp	2 Sep 2003 07:49:39 -0000	1.38
@@ -806,7 +806,7 @@
 			if (_scumm->_silentDigitalImuse == false) {
 				if (_channel[l]._mixerChannel == 0) {
 					_scumm->_mixer->newStream(&_channel[l]._mixerChannel, buf, mixer_size,
-					                           _channel[l]._freq, _channel[l]._mixerFlags, 100000, 127, 0);
+					                           _channel[l]._freq, _channel[l]._mixerFlags, 100000, 255, 0);
 				} else {
 					_scumm->_mixer->appendStream(_channel[l]._mixerChannel, buf, mixer_size);
 				}

Index: sound.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/scumm/sound.cpp,v
retrieving revision 1.217
retrieving revision 1.218
diff -u -d -r1.217 -r1.218
--- sound.cpp	2 Sep 2003 07:18:24 -0000	1.217
+++ sound.cpp	2 Sep 2003 07:49:39 -0000	1.218
@@ -214,7 +214,7 @@
 			// Allocate a sound buffer, copy the data into it, and play
 			sound = (char *)malloc(size);
 			memcpy(sound, ptr, size);
-			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID);
+			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID);
 			return;
 		}
 		// Support for Putt-Putt sounds - very hackish, too 8-)
@@ -232,7 +232,7 @@
 			// Allocate a sound buffer, copy the data into it, and play
 			sound = (char *)malloc(size);
 			memcpy(sound, ptr + 8, size);
-			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID);
+			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID);
 			return;
 		}
 		else if (READ_UINT32(ptr) == MKID('MRAW')) {
@@ -249,7 +249,7 @@
 			// Allocate a sound buffer, copy the data into it, and play
 			sound = (char *)malloc(size);
 			memcpy(sound, ptr + 8, size);
-			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID);
+			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID);
 			
 			return;
 		}	
@@ -318,7 +318,7 @@
 			// Allocate a sound buffer, copy the data into it, and play
 			sound = (char *)malloc(size);
 			memcpy(sound, ptr + 33, size);
-			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 127, 0, soundID);
+			_scumm->_mixer->playRaw(NULL, sound, size, rate, flags, 255, 0, soundID);
 			return;
 		} else if (_scumm->_features & GF_FMTOWNS) {
 			size = READ_LE_UINT32(ptr);
@@ -361,7 +361,7 @@
 							}
 						}
 
-						_scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, 127, 0, soundID, loopStart, loopEnd);
+						_scumm->_mixer->playRaw(NULL, sound, waveSize, rate, flags, 255, 0, soundID, loopStart, loopEnd);
 					}
 					break;
 				}
@@ -446,10 +446,10 @@
 				// the first check is for pitch-bending looped sounds (i.e. "pouring liquid", "biplane dive", etc.)
 				// the second check is for simple looped sounds
 				_scumm->_mixer->playRaw(NULL, sound, size, rate,
-							SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 127, 0, soundID,
+							SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 255, 0, soundID,
 							READ_BE_UINT16(ptr + 10) - READ_BE_UINT16(ptr + 8),READ_BE_UINT16(ptr + 14));
 			} else {
-				_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 127, 0, soundID);
+				_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 255, 0, soundID);
 			}
 			return;
 		}
@@ -468,10 +468,10 @@
 			// Experimental sound looping support
 			if (start == 108 || start == 106)
 				_scumm->_mixer->playRaw(NULL, sound, size, rate,
-						SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 127, 0, soundID,
+						SoundMixer::FLAG_AUTOFREE | SoundMixer::FLAG_LOOP, 255, 0, soundID,
 						start,size);
 			else
-				_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 127, 0, soundID);
+				_scumm->_mixer->playRaw(NULL, sound, size, rate, SoundMixer::FLAG_AUTOFREE, 255, 0, soundID);
 			return;
 		}
 	}
@@ -570,7 +570,7 @@
 		_sfxFile->seek(offset + 48, SEEK_SET);
 		sound = (byte *)malloc(b - 64);
 		_sfxFile->read(sound, b - 64);
-		_scumm->_mixer->playRaw(handle, sound, b - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 127, 0);
+		_scumm->_mixer->playRaw(handle, sound, b - 64, 11025, SoundMixer::FLAG_UNSIGNED | SoundMixer::FLAG_AUTOFREE, 255, 0);
 		return;
 	}
 
@@ -1256,7 +1256,7 @@
 	_bundleMusicPosition += final_size;
 	if (_bundleMusicTrack == 0) {
 		_scumm->_mixer->newStream(&_bundleMusicTrack, buffer, final_size, rate,
-															SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000, 127, 0);
+															SoundMixer::FLAG_16BITS | SoundMixer::FLAG_STEREO, 300000, 255, 0);
 	} else {
 		_scumm->_mixer->appendStream(_bundleMusicTrack, buffer, final_size);
 	}
@@ -1381,7 +1381,7 @@
 	byte flags = SoundMixer::FLAG_AUTOFREE;
 	if (isUnsigned)
 		flags |= SoundMixer::FLAG_UNSIGNED;
-	_scumm->_mixer->playRaw(handle, sound, size, rate, flags, 127, 0);
+	_scumm->_mixer->playRaw(handle, sound, size, rate, flags, 255, 0);
 }
 
 #ifdef USE_VORBIS