[Scummvm-cvs-logs] scummvm master -> b8aca5c202012dd6121598f06aca6715cbd365ca

[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:
b8aca5c202 SCI: Add missing USE_MAD check for commit 6a519f7f


Commit: b8aca5c202012dd6121598f06aca6715cbd365ca
    https://github.com/scummvm/scummvm/commit/b8aca5c202012dd6121598f06aca6715cbd365ca
Author: Filippos Karapetis (bluegr at gmail.com)
Date: 2014-03-28T22:00:12+02:00

Commit Message:
SCI: Add missing USE_MAD check for commit 6a519f7f

This fixes compilation for platforms where libmad isn't present

Changed paths:
    engines/sci/sound/audio.cpp



diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp
index 228abba..8e35d6b 100644
--- a/engines/sci/sound/audio.cpp
+++ b/engines/sci/sound/audio.cpp
@@ -79,6 +79,7 @@ void AudioPlayer::handleFanmadeSciAudio(reg_t sciAudioObject, SegManager *segMan
 	Common::String command = segMan->getString(commandReg);
 
 	if (command == "play" || command == "playx") {
+#ifdef USE_MAD
 		reg_t fileNameReg = readSelector(segMan, sciAudioObject, kernel->findSelector("fileName"));
 		Common::String fileName = segMan->getString(fileNameReg);
 
@@ -102,11 +103,13 @@ void AudioPlayer::handleFanmadeSciAudio(reg_t sciAudioObject, SegManager *segMan
 				fileName.setChar('/', i);
 		}
 		sciAudio->open("sciAudio/" + fileName);
+
 		Audio::SeekableAudioStream *audioStream = Audio::makeMP3Stream(sciAudio, DisposeAfterUse::YES);
 
 		// We only support one audio handle
 		_mixer->playStream(soundType, &_audioHandle,
 							Audio::makeLoopingAudioStream((Audio::RewindableAudioStream *)audioStream, loopCount));
+#endif
 	} else if (command == "stop") {
 		_mixer->stopHandle(_audioHandle);
 	} else {