From df80820184c90a87511f0cabdca4addb9fa13a66 Mon Sep 17 00:00:00 2001
From: Johannes Schickel
Date: Tue, 4 Sep 2012 20:29:14 +0200
Subject: 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.
---
 engines/wintermute/base/sound/base_sound_buffer.cpp | 2 --
 1 file changed, 2 deletions(-)

(limited to 'engines/wintermute/base/sound')

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;
-- 
cgit v1.2.3