diff options
| author | Max Horn | 2010-01-08 22:07:35 +0000 |
|---|---|---|
| committer | Max Horn | 2010-01-08 22:07:35 +0000 |
| commit | 0cf53b025d8136a2f20ba405da1a696d0aa8767a (patch) | |
| tree | 72e4241bf099c72e1f0a843c5632594f6b4947f5 /engines/tinsel | |
| parent | 474d49946f5254bff7ac6a490fcc3b02655fae23 (diff) | |
| download | scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.tar.gz scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.tar.bz2 scummvm-rg350-0cf53b025d8136a2f20ba405da1a696d0aa8767a.zip | |
Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h
svn-id: r47180
Diffstat (limited to 'engines/tinsel')
| -rw-r--r-- | engines/tinsel/music.cpp | 2 | ||||
| -rw-r--r-- | engines/tinsel/sound.cpp | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 6a50295afd..d38739d46a 100644 --- a/engines/tinsel/music.cpp +++ b/engines/tinsel/music.cpp @@ -874,7 +874,7 @@ bool PCMMusicPlayer::getNextChunk() { "offset %d (script %d.%d)", sampleCLength, sampleOffset, _scriptNum, _scriptIndex - 1); - sampleStream = new Common::MemoryReadStream(buffer, sampleCLength, Common::DisposeAfterUse::YES); + sampleStream = new Common::MemoryReadStream(buffer, sampleCLength, DisposeAfterUse::YES); delete _curChunk; _curChunk = makeADPCMStream(sampleStream, true, sampleCLength, diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index 5d7bcfad72..9921d0edfa 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -132,7 +132,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, _vm->_config->_voiceVolume); Common::MemoryReadStream *compressedStream = - new Common::MemoryReadStream(sampleBuf, sampleLen, Common::DisposeAfterUse::YES); + new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES); Audio::AudioStream *sampleStream = 0; // play it @@ -283,7 +283,7 @@ bool SoundManager::playSample(int id, int sub, bool bLooped, int x, int y, int p error(FILE_IS_CORRUPT, _vm->getSampleFile(sampleLanguage)); Common::MemoryReadStream *compressedStream = - new Common::MemoryReadStream(sampleBuf, sampleLen, Common::DisposeAfterUse::YES); + new Common::MemoryReadStream(sampleBuf, sampleLen, DisposeAfterUse::YES); Audio::AudioStream *sampleStream = 0; switch (_soundMode) { |