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/sci/sound | |
| 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/sci/sound')
| -rw-r--r-- | engines/sci/sound/audio.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/engines/sci/sound/audio.cpp b/engines/sci/sound/audio.cpp index 8f6667c21e..5a4f7aeafc 100644 --- a/engines/sci/sound/audio.cpp +++ b/engines/sci/sound/audio.cpp @@ -218,10 +218,10 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 if (audioRes->headerSize > 0) { // SCI1.1 - Common::MemoryReadStream headerStream(audioRes->header, audioRes->headerSize, Common::DisposeAfterUse::NO); + Common::MemoryReadStream headerStream(audioRes->header, audioRes->headerSize, DisposeAfterUse::NO); if (readSOLHeader(&headerStream, audioRes->headerSize, size, _audioRate, audioFlags)) { - Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, Common::DisposeAfterUse::NO); + Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, DisposeAfterUse::NO); data = readSOLAudio(&dataStream, size, audioFlags, flags); } } else { @@ -229,7 +229,7 @@ Audio::RewindableAudioStream *AudioPlayer::getAudioStream(uint32 number, uint32 if (audioRes->size > 4) { if (memcmp(audioRes->data, "RIFF", 4) == 0) { // WAVE detected - Common::MemoryReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, Common::DisposeAfterUse::NO); + Common::MemoryReadStream *waveStream = new Common::MemoryReadStream(audioRes->data, audioRes->size, DisposeAfterUse::NO); audioStream = Audio::makeWAVStream(waveStream, true); } } |