[Scummvm-cvs-logs] SF.net SVN: scummvm:[36236] scummvm/trunk

Kirben at users.sourceforge.net Kirben at users.sourceforge.net
Sat Feb 7 06:05:14 CET 2009


Revision: 36236
          http://scummvm.svn.sourceforge.net/scummvm/?rev=36236&view=rev
Author:   Kirben
Date:     2009-02-07 05:05:14 +0000 (Sat, 07 Feb 2009)

Log Message:
-----------
Fix sound noise regression in CD32 version of Simon the Sorcerer 1.

Modified Paths:
--------------
    scummvm/trunk/engines/igor/igor.cpp
    scummvm/trunk/engines/kyra/sound.cpp
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/touche/resource.cpp
    scummvm/trunk/sound/voc.cpp

Modified: scummvm/trunk/engines/igor/igor.cpp
===================================================================
--- scummvm/trunk/engines/igor/igor.cpp	2009-02-07 04:49:10 UTC (rev 36235)
+++ scummvm/trunk/engines/igor/igor.cpp	2009-02-07 05:05:14 UTC (rev 36236)
@@ -424,7 +424,7 @@
 		return;
 	}
 	_sndFile.seek(soundOffset);
-	Audio::AudioStream *stream = Audio::makeVOCStream(_sndFile);
+	Audio::AudioStream *stream = Audio::makeVOCStream(_sndFile, Audio::Mixer::FLAG_UNSIGNED);
 	if (stream) {
 		_mixer->playInputStream(soundType, soundHandle, stream);
 	}

Modified: scummvm/trunk/engines/kyra/sound.cpp
===================================================================
--- scummvm/trunk/engines/kyra/sound.cpp	2009-02-07 04:49:10 UTC (rev 36235)
+++ scummvm/trunk/engines/kyra/sound.cpp	2009-02-07 05:05:14 UTC (rev 36236)
@@ -98,7 +98,7 @@
 			return 0;
 
 		Common::MemoryReadStream vocStream(fileData, fileSize);
-		audioStream = Audio::makeVOCStream(vocStream);
+		audioStream = Audio::makeVOCStream(vocStream, Audio::Mixer::FLAG_UNSIGNED);
 
 		delete[] fileData;
 		fileSize = 0;

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2009-02-07 04:49:10 UTC (rev 36235)
+++ scummvm/trunk/engines/scumm/sound.cpp	2009-02-07 05:05:14 UTC (rev 36236)
@@ -666,7 +666,7 @@
 	#endif
 			break;
 		default:
-			input = Audio::makeVOCStream(*_sfxFile);
+			input = Audio::makeVOCStream(*_sfxFile, Audio::Mixer::FLAG_UNSIGNED);
 			break;
 		}
 

Modified: scummvm/trunk/engines/touche/resource.cpp
===================================================================
--- scummvm/trunk/engines/touche/resource.cpp	2009-02-07 04:49:10 UTC (rev 36235)
+++ scummvm/trunk/engines/touche/resource.cpp	2009-02-07 05:05:14 UTC (rev 36236)
@@ -589,7 +589,7 @@
 		uint32 size;
 		const uint32 offs = res_getDataOffset(kResourceTypeSound, num, &size);
 		_fData.seek(offs);
-		Audio::AudioStream *stream = Audio::makeVOCStream(_fData);
+		Audio::AudioStream *stream = Audio::makeVOCStream(_fData, Audio::Mixer::FLAG_UNSIGNED);
 		if (stream) {
 			_mixer->playInputStream(Audio::Mixer::kSFXSoundType, &_sfxHandle, stream);
 		}
@@ -647,7 +647,7 @@
 				return;
 			}
 			_fSpeech[i].seek(offs);
-			stream = Audio::makeVOCStream(_fSpeech[i]);
+			stream = Audio::makeVOCStream(_fSpeech[i], Audio::Mixer::FLAG_UNSIGNED);
 		} else {
 			if (num >= 750) {
 				num -= 750;

Modified: scummvm/trunk/sound/voc.cpp
===================================================================
--- scummvm/trunk/sound/voc.cpp	2009-02-07 04:49:10 UTC (rev 36235)
+++ scummvm/trunk/sound/voc.cpp	2009-02-07 05:05:14 UTC (rev 36236)
@@ -164,10 +164,6 @@
 	if (!data)
 		return 0;
 
-	// Default to unsigned sound data, if not flags set
-	if (!flags)
-		 flags |= Audio::Mixer::FLAG_UNSIGNED;
-
 	return makeLinearInputStream(data, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE, loopStart, loopEnd);
 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




More information about the Scummvm-git-logs mailing list