diff options
| author | Benjamin Haisch | 2010-01-21 08:17:39 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-20 22:43:08 +0100 |
| commit | 69f35c87092568901e42c897ac08a786c7a46a30 (patch) | |
| tree | 4f403e6f7b56cc118425cae13ae82cdd44fb5777 | |
| parent | 5948672be5bda52ec5143016cb8b02a29e7d9276 (diff) | |
| download | scummvm-rg350-69f35c87092568901e42c897ac08a786c7a46a30.tar.gz scummvm-rg350-69f35c87092568901e42c897ac08a786c7a46a30.tar.bz2 scummvm-rg350-69f35c87092568901e42c897ac08a786c7a46a30.zip | |
TOLTECS: Fixed compilation
| -rw-r--r-- | engines/toltecs/movie.cpp | 3 | ||||
| -rw-r--r-- | engines/toltecs/sound.cpp | 6 |
2 files changed, 5 insertions, 4 deletions
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; |