[Scummvm-git-logs] scummvm master -> e45a0ce3da708594d413b8d628f018980061fc33

[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:
e45a0ce3da SWORD25: Fix otherwise unused variable not guarded by USE_VORBIS


Commit: e45a0ce3da708594d413b8d628f018980061fc33
    https://github.com/scummvm/scummvm/commit/e45a0ce3da708594d413b8d628f018980061fc33
Author: Adrian Frühwirth (bonki at users.noreply.github.com)
Date: 2018-05-07T09:30:00+02:00

Commit Message:
SWORD25: Fix otherwise unused variable not guarded by USE_VORBIS

This silences a gcc warning when compiling with -Wunused-variable.

Changed paths:
    engines/sword25/sfx/soundengine.cpp


diff --git a/engines/sword25/sfx/soundengine.cpp b/engines/sword25/sfx/soundengine.cpp
index 8bc2018..2e7b41c 100644
--- a/engines/sword25/sfx/soundengine.cpp
+++ b/engines/sword25/sfx/soundengine.cpp
@@ -203,8 +203,8 @@ bool SoundEngine::playSound(const Common::String &fileName, SOUND_TYPES type, fl
 }
 
 uint SoundEngine::playSoundEx(const Common::String &fileName, SOUND_TYPES type, float volume, float pan, bool loop, int loopStart, int loopEnd, uint layer, uint handleId) {
-	Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(fileName);
 #ifdef USE_VORBIS
+	Common::SeekableReadStream *in = Kernel::getInstance()->getPackage()->getStream(fileName);
 	Audio::SeekableAudioStream *stream = Audio::makeVorbisStream(in, DisposeAfterUse::YES);
 #endif
 	uint id = handleId;