[Scummvm-cvs-logs] scummvm master -> 4cfd906cec08fec8c27f33c1a54651271a4fb104

[bluegr]

This automated email contains information about 1 new commit which have been
pushed to the 'scummvm' repo located at https://github.com/scummvm/scummvm .

Summary:
4cfd906cec WINTERMUTE: Fix compilation when vorbis isn't available


Commit: 4cfd906cec08fec8c27f33c1a54651271a4fb104
    https://github.com/scummvm/scummvm/commit/4cfd906cec08fec8c27f33c1a54651271a4fb104
Author: Filippos Karapetis (md5 at scummvm.org)
Date: 2012-09-04T10:27:19-07:00

Commit Message:
WINTERMUTE: Fix compilation when vorbis isn't available

Changed paths:
    engines/wintermute/base/sound/base_sound_buffer.cpp



diff --git a/engines/wintermute/base/sound/base_sound_buffer.cpp b/engines/wintermute/base/sound/base_sound_buffer.cpp
index e2d9c8c..24414e3 100644
--- a/engines/wintermute/base/sound/base_sound_buffer.cpp
+++ b/engines/wintermute/base/sound/base_sound_buffer.cpp
@@ -104,7 +104,9 @@ 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;