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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Apr 18 01:57:50 CEST 2010


Revision: 48696
          http://scummvm.svn.sourceforge.net/scummvm/?rev=48696&view=rev
Author:   fingolfin
Date:     2010-04-17 23:57:50 +0000 (Sat, 17 Apr 2010)

Log Message:
-----------
Fix warnings when FLAC&MP3&VORBIS is disabled; also fixes leak in Tinsel

Modified Paths:
--------------
    scummvm/trunk/engines/scumm/sound.cpp
    scummvm/trunk/engines/sword2/music.cpp
    scummvm/trunk/engines/tinsel/sound.cpp

Modified: scummvm/trunk/engines/scumm/sound.cpp
===================================================================
--- scummvm/trunk/engines/scumm/sound.cpp	2010-04-17 23:54:06 UTC (rev 48695)
+++ scummvm/trunk/engines/scumm/sound.cpp	2010-04-17 23:57:50 UTC (rev 48696)
@@ -634,31 +634,36 @@
 
 	if (!_soundsPaused && _mixer->isReady()) {
 		Audio::AudioStream *input = NULL;
-		Common::MemoryReadStream *tmp = NULL;
 
 		switch (_soundMode) {
 		case kMP3Mode:
 #ifdef USE_MAD
+			{
 			assert(size > 0);
-			tmp = _sfxFile->readStream(size);
+			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		case kVorbisMode:
 #ifdef USE_VORBIS
+			{
 			assert(size > 0);
-			tmp = _sfxFile->readStream(size);
+			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		case kFLACMode:
 #ifdef USE_FLAC
+			{
 			assert(size > 0);
-			tmp = _sfxFile->readStream(size);
+			Common::MemoryReadStream *tmp = _sfxFile->readStream(size);
 			assert(tmp);
 			input = Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		default:

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2010-04-17 23:54:06 UTC (rev 48695)
+++ scummvm/trunk/engines/sword2/music.cpp	2010-04-17 23:57:50 UTC (rev 48696)
@@ -188,8 +188,6 @@
 
 	fh->file.seek(pos, SEEK_SET);
 
-	SafeSubReadStream *tmp = 0;
-
 	switch (fh->fileType) {
 	case kCLUMode:
 		if (Sword2Engine::isPsx())
@@ -197,19 +195,22 @@
 		else
 			return makeCLUStream(&fh->file, enc_len);
 #ifdef USE_MAD
-	case kMP3Mode:
-		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
+	case kMP3Mode: {
+		SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeMP3Stream(tmp, DisposeAfterUse::YES);
+		}
 #endif
 #ifdef USE_VORBIS
-	case kVorbisMode:
-		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
+	case kVorbisMode: {
+		SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeVorbisStream(tmp, DisposeAfterUse::YES);
+		}
 #endif
 #ifdef USE_FLAC
-	case kFLACMode:
-		tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
+	case kFLACMode: {
+		SafeSubReadStream *tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len);
 		return Audio::makeFLACStream(tmp, DisposeAfterUse::YES);
+		}
 #endif
 	default:
 		return NULL;

Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp	2010-04-17 23:54:06 UTC (rev 48695)
+++ scummvm/trunk/engines/tinsel/sound.cpp	2010-04-17 23:57:50 UTC (rev 48696)
@@ -132,25 +132,35 @@
 		//_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kMusicSoundType, soundVolumeMusic);
 		_vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume);
 
-		Common::MemoryReadStream *compressedStream =
-			new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES);
 		Audio::AudioStream *sampleStream = 0;
 
 		// play it
 		switch (_soundMode) {
 		case kMP3Mode:
 #ifdef USE_MAD
+			{
+			Common::MemoryReadStream *compressedStream =
+				new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES);
 			sampleStream = Audio::makeMP3Stream(compressedStream, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		case kVorbisMode:
 #ifdef USE_VORBIS
+			{
+			Common::MemoryReadStream *compressedStream =
+				new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES);
 			sampleStream = Audio::makeVorbisStream(compressedStream, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		case kFLACMode:
 #ifdef USE_FLAC
+			{
+			Common::MemoryReadStream *compressedStream =
+				new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES);
 			sampleStream = Audio::makeFLACStream(compressedStream, DisposeAfterUse::YES);
+			}
 #endif
 			break;
 		default:


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