From 69f35c87092568901e42c897ac08a786c7a46a30 Mon Sep 17 00:00:00 2001
From: Benjamin Haisch
Date: Thu, 21 Jan 2010 08:17:39 +0000
Subject: TOLTECS: Fixed compilation

---
 engines/toltecs/movie.cpp | 3 ++-
 engines/toltecs/sound.cpp | 6 +++---
 2 files changed, 5 insertions(+), 4 deletions(-)

(limited to 'engines')

diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp
index ab920d5c49..8cc627477c 100644
--- a/engines/toltecs/movie.cpp
+++ b/engines/toltecs/movie.cpp
@@ -31,6 +31,7 @@
 #include "base/version.h"
 
 #include "sound/mixer.h"
+#include "sound/raw.h"
 
 #include "toltecs/toltecs.h"
 #include "toltecs/movie.h"
@@ -197,7 +198,7 @@ void MoviePlayer::fetchAudioChunks() {
 		if (chunkType == 4) {
 			byte *chunkBuffer = new byte[chunkSize];
 			_vm->_arc->read(chunkBuffer, chunkSize);
-			_audioStream->queueBuffer(chunkBuffer, chunkSize, DisposeAfterUse::YES, Audio::Mixer::FLAG_UNSIGNED);
+			_audioStream->queueBuffer(chunkBuffer, chunkSize, DisposeAfterUse::YES, Audio::FLAG_UNSIGNED);
 			chunkBuffer = NULL;
 			prefetchChunkCount++;
 			_soundChunkFramesLeft += _framesPerSoundChunk;
diff --git a/engines/toltecs/sound.cpp b/engines/toltecs/sound.cpp
index d479b86275..42f4e107b8 100644
--- a/engines/toltecs/sound.cpp
+++ b/engines/toltecs/sound.cpp
@@ -148,11 +148,11 @@ void Sound::internalPlaySound(int16 resIndex, int16 type, int16 volume, int16 pa
 
 			Resource *soundResource = _vm->_res->load(resIndex);
 
-			byte flags = Audio::Mixer::FLAG_UNSIGNED;
+			byte flags = Audio::FLAG_UNSIGNED;
 			// Background sounds
 			if (type == kChannelTypeBackground)
-				flags |= Audio::Mixer::FLAG_LOOP;
-			Audio::AudioStream *stream = Audio::makeRawMemoryStream(soundResource->data, soundResource->size, DisposeAfterUse::YES, 22050, flags, 0, 0);
+				flags |= Audio::FLAG_LOOP;
+			Audio::AudioStream *stream = Audio::makeRawMemoryStream(soundResource->data, soundResource->size, DisposeAfterUse::YES/*CHECKME*/, 22050, flags, 0, 0);
 
 			channels[freeChannel].type = type;
 			channels[freeChannel].resIndex = resIndex;
-- 
cgit v1.2.3