diff options
| author | Max Horn | 2010-04-17 23:57:50 +0000 |
|---|---|---|
| committer | Max Horn | 2010-04-17 23:57:50 +0000 |
| commit | 6d8042490891f3864bf1a6492de77b572932a212 (patch) | |
| tree | 5c430a2fbd96740d4f683127781eb80b6b97eeb4 /engines/scumm/sound.cpp | |
| parent | b29b379894ac09f637218a6bb3f2ecea56a20379 (diff) | |
| download | scummvm-rg350-6d8042490891f3864bf1a6492de77b572932a212.tar.gz scummvm-rg350-6d8042490891f3864bf1a6492de77b572932a212.tar.bz2 scummvm-rg350-6d8042490891f3864bf1a6492de77b572932a212.zip | |
Fix warnings when FLAC&MP3&VORBIS is disabled; also fixes leak in Tinsel
svn-id: r48696
Diffstat (limited to 'engines/scumm/sound.cpp')
| -rw-r--r-- | engines/scumm/sound.cpp | 13 |
1 files changed, 9 insertions, 4 deletions
diff --git a/engines/scumm/sound.cpp b/engines/scumm/sound.cpp index 85e8636e48..65c50aff14 100644 --- a/engines/scumm/sound.cpp +++ b/engines/scumm/sound.cpp @@ -634,31 +634,36 @@ void Sound::startTalkSound(uint32 offset, uint32 b, int mode, Audio::SoundHandle 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: |