diff options
| author | Benjamin Haisch | 2010-01-09 17:23:04 +0000 |
|---|---|---|
| committer | Willem Jan Palenstijn | 2011-11-20 22:43:08 +0100 |
| commit | a0432fd54641381d88b3fb91b2669ed0072f32b1 (patch) | |
| tree | 6e23de50638eee67166d229923cd5b787e1e1e53 /engines | |
| parent | cb5c0e698667ff0e277be19b01b406367a0747c9 (diff) | |
| download | scummvm-rg350-a0432fd54641381d88b3fb91b2669ed0072f32b1.tar.gz scummvm-rg350-a0432fd54641381d88b3fb91b2669ed0072f32b1.tar.bz2 scummvm-rg350-a0432fd54641381d88b3fb91b2669ed0072f32b1.zip | |
TOLTECS: Fixed compilation
Diffstat (limited to 'engines')
| -rw-r--r-- | engines/toltecs/movie.cpp | 4 | ||||
| -rw-r--r-- | engines/toltecs/movie.h | 2 | ||||
| -rw-r--r-- | engines/toltecs/toltecs.cpp | 5 |
3 files changed, 6 insertions, 5 deletions
diff --git a/engines/toltecs/movie.cpp b/engines/toltecs/movie.cpp index eedf4966da..8cd14526a5 100644 --- a/engines/toltecs/movie.cpp +++ b/engines/toltecs/movie.cpp @@ -78,7 +78,7 @@ void MoviePlayer::playMovie(uint resIndex) { _vm->_cameraX = 0; _vm->_cameraY = 0; - _audioStream = Audio::makeAppendableAudioStream(22050, Audio::Mixer::FLAG_UNSIGNED); + _audioStream = Audio::makeQueuingAudioStream(22050, false); _vm->_mixer->playInputStream(Audio::Mixer::kPlainSoundType, &_audioStreamHandle, _audioStream); @@ -197,7 +197,7 @@ void MoviePlayer::fetchAudioChunks() { if (chunkType == 4) { byte *chunkBuffer = new byte[chunkSize]; _vm->_arc->read(chunkBuffer, chunkSize); - _audioStream->queueBuffer(chunkBuffer, chunkSize); + _audioStream->queueBuffer(chunkBuffer, chunkSize, Audio::Mixer::FLAG_UNSIGNED); chunkBuffer = NULL; prefetchChunkCount++; _soundChunkFramesLeft += _framesPerSoundChunk; diff --git a/engines/toltecs/movie.h b/engines/toltecs/movie.h index abb7532491..00af2ee429 100644 --- a/engines/toltecs/movie.h +++ b/engines/toltecs/movie.h @@ -54,7 +54,7 @@ public: protected: ToltecsEngine *_vm; - Audio::AppendableAudioStream *_audioStream; + Audio::QueuingAudioStream *_audioStream; Audio::SoundHandle _audioStreamHandle; uint32 _chunkCount, _frameCount, _lastPrefetchOfs; diff --git a/engines/toltecs/toltecs.cpp b/engines/toltecs/toltecs.cpp index ad4066360b..6e9df70328 100644 --- a/engines/toltecs/toltecs.cpp +++ b/engines/toltecs/toltecs.cpp @@ -150,7 +150,7 @@ Common::Error ToltecsEngine::run() { syncSoundSettings(); -#define TEST_MENU +//#define TEST_MENU #ifdef TEST_MENU _screen->registerFont(0, 0x0D); _screen->registerFont(1, 0x0E); @@ -167,9 +167,10 @@ Common::Error ToltecsEngine::run() { updateScreen(); } */ + return Common::kNoError; #endif -#if 0 +#if 1 _script->loadScript(0, 0); _script->runScript(0); #endif |