[Scummvm-git-logs] scummvm master -> 98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7

[bonki]

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:
98067b0fe6 WINTERMUTE: Properly fix handling of Ogg Vorbis resources


Commit: 98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7
    https://github.com/scummvm/scummvm/commit/98067b0fe6cdccd6a1cbc6abda8fa36a39bb7fd7
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-19T21:03:15+02:00

Commit Message:
WINTERMUTE: Properly fix handling of Ogg Vorbis resources

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 9891db1..0c81033 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;