[Scummvm-cvs-logs] SF.net SVN: scummvm: [24117] scummvm/trunk/engines/agos/sound.cpp

[kirben at users.sourceforge.net]

Revision: 24117
          http://svn.sourceforge.net/scummvm/?rev=24117&view=rev
Author:   kirben
Date:     2006-10-04 17:16:50 -0700 (Wed, 04 Oct 2006)

Log Message:
-----------
Remove sound hacks for DS port, which would cause no speech or subtitles in Simon 1 with speech

Modified Paths:
--------------
    scummvm/trunk/engines/agos/sound.cpp

Modified: scummvm/trunk/engines/agos/sound.cpp
===================================================================
--- scummvm/trunk/engines/agos/sound.cpp	2006-10-04 20:22:47 UTC (rev 24116)
+++ scummvm/trunk/engines/agos/sound.cpp	2006-10-05 00:16:50 UTC (rev 24117)
@@ -143,13 +143,9 @@
 	flags |= wavFlags;
 
 	byte *buffer = (byte *)malloc(size);
-	// Check whether malloc was successful.
-	// TODO: Maybe we can handle this more graceful, by reverting to a smaller
-	// buffer and reading the audio data one piece at a time?
-	if (buffer) {
-		_file->read(buffer, size);
-		_mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
-	}
+	assert(buffer);
+	_file->read(buffer, size);
+	_mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
 }
 
 void VocSound::playSound(uint sound, Audio::SoundHandle *handle, byte flags) {
@@ -160,6 +156,7 @@
 
 	int size, rate;
 	byte *buffer = Audio::loadVOCFromStream(*_file, size, rate);
+	assert(buffer);
 	_mixer->playRaw(handle, buffer, size, rate, flags | Audio::Mixer::FLAG_AUTOFREE);
 }
 
@@ -171,13 +168,9 @@
 
 	uint size = _file->readUint32BE();
 	byte *buffer = (byte *)malloc(size);
-	// Check whether malloc was successful.
-	// TODO: Maybe we can handle this more graceful, by reverting to a smaller
-	// buffer and reading the audio data one piece at a time?
-	if (buffer) {
-		_file->read(buffer, size);
-		_mixer->playRaw(handle, buffer, size, 22050, flags | Audio::Mixer::FLAG_AUTOFREE);
-	}
+	assert(buffer);
+	_file->read(buffer, size);
+	_mixer->playRaw(handle, buffer, size, 22050, flags | Audio::Mixer::FLAG_AUTOFREE);
 }
 
 #ifdef USE_MAD


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