[Scummvm-cvs-logs] scummvm master -> 35e526d34b4306739938a80c329a24b294a1860d

Strangerke Strangerke at scummvm.org
Sun Jan 3 00:59:24 CET 2016


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:
35e526d34b TONY: Fix Amiga Build by adding missing sound ifdefs


Commit: 35e526d34b4306739938a80c329a24b294a1860d
    https://github.com/scummvm/scummvm/commit/35e526d34b4306739938a80c329a24b294a1860d
Author: Strangerke (strangerke at scummvm.org)
Date: 2016-01-03T00:52:35+01:00

Commit Message:
TONY: Fix Amiga Build by adding missing sound ifdefs

Changed paths:
    engines/tony/sound.cpp



diff --git a/engines/tony/sound.cpp b/engines/tony/sound.cpp
index 2fc0afa..7320565 100644
--- a/engines/tony/sound.cpp
+++ b/engines/tony/sound.cpp
@@ -557,13 +557,19 @@ bool FPStream::loadFile(const Common::String &fileName, int bufSize) {
 		_rewindableStream = Audio::makeADPCMStream(_file.readStream(_size), DisposeAfterUse::YES, 0, Audio::kADPCMDVI, 44100, 2);
 		break;
 	case FPCODEC_MP3:
+#ifdef USE_MAD
 		_rewindableStream = Audio::makeMP3Stream(&_file, DisposeAfterUse::YES);
+#endif
 		break;
 	case FPCODEC_OGG:
+#ifdef USE_VORBIS
 		_rewindableStream = Audio::makeVorbisStream(&_file, DisposeAfterUse::YES);
+#endif
 		break;
 	case FPCODEC_FLAC:
+#ifdef USE_FLAC
 		_rewindableStream = Audio::makeFLACStream(&_file, DisposeAfterUse::YES);
+#endif
 		break;
 	default:
 		break;






More information about the Scummvm-git-logs mailing list