diff options
| author | Johannes Schickel | 2012-09-04 20:29:14 +0200 |
|---|---|---|
| committer | Johannes Schickel | 2012-09-04 20:38:22 +0200 |
| commit | df80820184c90a87511f0cabdca4addb9fa13a66 (patch) | |
| tree | 27679f8335f4d9cc3e2110ea103da19b67266801 /engines | |
| parent | 0612aac72b160ef5db15c1ae004536155f8b3826 (diff) | |
| download | scummvm-rg350-df80820184c90a87511f0cabdca4addb9fa13a66.tar.gz scummvm-rg350-df80820184c90a87511f0cabdca4addb9fa13a66.tar.bz2 scummvm-rg350-df80820184c90a87511f0cabdca4addb9fa13a66.zip | |
Revert "WINTERMUTE: Fix compilation when vorbis isn't available"
This reverts commit 4cfd906cec08fec8c27f33c1a54651271a4fb104.
We now have vorbis as a hard requirement for Wintermute. Also somaen said this
commit causes issues, so we agreed on reverting this hack.
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/wintermute/base/sound/base_sound_buffer.cpp | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp index 24414e33a7..e2d9c8c13f 100644 --- a/engines/wintermute/base/sound/base_sound_buffer.cpp +++ b/engines/wintermute/base/sound/base_sound_buffer.cpp @@ -104,9 +104,7 @@ bool BaseSoundBuffer::loadFromFile(const Common::String &filename, bool forceRel Common::String strFilename(filename);
strFilename.toLowercase();
if (strFilename.hasSuffix(".ogg")) {
-#ifdef USE_VORBIS
_stream = Audio::makeVorbisStream(_file, DisposeAfterUse::YES);
-#endif
} else if (strFilename.hasSuffix(".wav")) {
int waveSize, waveRate;
byte waveFlags;
|