diff options
| author | Adrian Frühwirth | 2018-05-19 21:03:14 +0200 |
|---|---|---|
| committer | Adrian Frühwirth | 2018-05-19 21:03:15 +0200 |
| commit | 98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7 (patch) | |
| tree | 54bce29e75b1a1804536fb0957bfceadbcb0691d | |
| parent | d022572f1624fd2d1ccc0dbb53ab5bda17b50e85 (diff) | |
| download | scummvm-rg350-98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7.tar.gz scummvm-rg350-98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7.tar.bz2 scummvm-rg350-98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7.zip | |
WINTERMUTE: Properly fix handling of Ogg Vorbis resources
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.cpp | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 9891db1cb2..0c8103339f 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -104,12 +104,13 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel } Common::String strFilename(filename); strFilename.toLowercase(); - #ifdef USE_VORBIS - if (strFilename.hasSuffix(".ogg")) { - _stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES); - } else - #endif - if (strFilename.hasSuffix(".wav")) { + if (strFilename.hasSuffix(".ogg")) { +#ifdef USE_VORBIS + _stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES); +#else + error("BSoundBuffer::LoadFromFile - Ogg Vorbis not supported by this version of ScummVM (please report as this shouldn't trigger)"); +#endif + } else if (strFilename.hasSuffix(".wav")) { int waveSize, waveRate; byte waveFlags; uint16 waveType; |