diff options
Diffstat (limited to 'engines')
-rw-r--r-- | engines/agi/sound.cpp | 2 | ||||
-rw-r--r-- | engines/cruise/overlay.cpp | 4 | ||||
-rw-r--r-- | engines/groovie/resource.cpp | 2 | ||||
-rw-r--r-- | engines/groovie/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/resource_intern.cpp | 4 | ||||
-rw-r--r-- | engines/kyra/saveload_hof.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/saveload_lol.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/saveload_mr.cpp | 2 | ||||
-rw-r--r-- | engines/kyra/screen.cpp | 2 | ||||
-rw-r--r-- | engines/m4/compression.h | 2 | ||||
-rw-r--r-- | engines/made/redreader.cpp | 2 | ||||
-rw-r--r-- | engines/parallaction/disk_ns.cpp | 4 | ||||
-rw-r--r-- | engines/parallaction/font.cpp | 2 | ||||
-rw-r--r-- | engines/saga/sound.cpp | 6 | ||||
-rw-r--r-- | engines/sci/sfx/core.cpp | 4 | ||||
-rw-r--r-- | engines/scumm/saveload.cpp | 2 | ||||
-rw-r--r-- | engines/sword2/music.cpp | 25 | ||||
-rw-r--r-- | engines/teenagent/pack.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/music.cpp | 2 | ||||
-rw-r--r-- | engines/tinsel/sound.cpp | 4 |
20 files changed, 39 insertions, 38 deletions
diff --git a/engines/agi/sound.cpp b/engines/agi/sound.cpp index 5a39b663a5..05cbdaba5e 100644 --- a/engines/agi/sound.cpp +++ b/engines/agi/sound.cpp @@ -89,7 +89,7 @@ const uint8 *PCjrSound::getVoicePointer(uint voiceNum) { } IIgsSample::IIgsSample(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : AgiSound(manager) { - Common::MemoryReadStream stream(data, len, true); + Common::MemoryReadStream stream(data, len, Common::DisposeAfterUse::YES); // Check that the header was read ok and that it's of the correct type if (_header.read(stream) && _header.type == AGI_SOUND_SAMPLE) { // An Apple IIGS AGI sample resource diff --git a/engines/cruise/overlay.cpp b/engines/cruise/overlay.cpp index 085f8b25c4..8ed129a424 100644 --- a/engines/cruise/overlay.cpp +++ b/engines/cruise/overlay.cpp @@ -209,7 +209,7 @@ int loadOverlay(const char *scriptName) { debug(1, "OVL loading done..."); - Common::MemoryReadStream s(unpackedBuffer, unpackedSize, true); + Common::MemoryReadStream s(unpackedBuffer, unpackedSize, Common::DisposeAfterUse::YES); unpackedBuffer = NULL; ovlData = overlayTable[scriptIdx].ovlData; @@ -590,7 +590,7 @@ int loadOverlay(const char *scriptName) { loadPackedFileToMem(fileIdx, (uint8 *) unpackedBuffer); } - Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, true); + Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, Common::DisposeAfterUse::YES); unpackedBuffer = NULL; ovlData->specialString1Length = s2.readUint16BE(); diff --git a/engines/groovie/resource.cpp b/engines/groovie/resource.cpp index 148fa9c451..6a3a9c9f04 100644 --- a/engines/groovie/resource.cpp +++ b/engines/groovie/resource.cpp @@ -65,7 +65,7 @@ Common::SeekableReadStream *ResMan::open(uint32 fileRef) { } // Returning the resource substream - return new Common::SeekableSubReadStream(gjdFile, resInfo.offset, resInfo.offset + resInfo.size, true); + return new Common::SeekableSubReadStream(gjdFile, resInfo.offset, resInfo.offset + resInfo.size, Common::DisposeAfterUse::YES); } diff --git a/engines/groovie/saveload.cpp b/engines/groovie/saveload.cpp index ec182af3c5..98c02284f1 100644 --- a/engines/groovie/saveload.cpp +++ b/engines/groovie/saveload.cpp @@ -138,7 +138,7 @@ Common::InSaveFile *SaveLoad::openForLoading(const Common::String &target, int s } // Return a substream, skipping the metadata - Common::SeekableSubReadStream *sub = new Common::SeekableSubReadStream(savefile, metaDataSize, savefile->size(), true); + Common::SeekableSubReadStream *sub = new Common::SeekableSubReadStream(savefile, metaDataSize, savefile->size(), Common::DisposeAfterUse::YES); // Move to the beginning of the substream sub->seek(0, SEEK_SET); diff --git a/engines/kyra/resource_intern.cpp b/engines/kyra/resource_intern.cpp index 4c04cc5e7d..639dc96800 100644 --- a/engines/kyra/resource_intern.cpp +++ b/engines/kyra/resource_intern.cpp @@ -78,7 +78,7 @@ Common::SeekableReadStream *PlainArchive::createReadStreamForMember(const Common if (!parent) return 0; - return new Common::SeekableSubReadStream(parent, fDesc->_value.offset, fDesc->_value.offset + fDesc->_value.size, true); + return new Common::SeekableSubReadStream(parent, fDesc->_value.offset, fDesc->_value.offset + fDesc->_value.size, Common::DisposeAfterUse::YES); } // -> CachedArchive implementation @@ -130,7 +130,7 @@ Common::SeekableReadStream *CachedArchive::createReadStreamForMember(const Commo if (fDesc == _files.end()) return 0; - return new Common::MemoryReadStream(fDesc->_value.data, fDesc->_value.size, false); + return new Common::MemoryReadStream(fDesc->_value.data, fDesc->_value.size, Common::DisposeAfterUse::NO); } // ResFileLoader implementations diff --git a/engines/kyra/saveload_hof.cpp b/engines/kyra/saveload_hof.cpp index 4ff63eaff0..4ddd2a5392 100644 --- a/engines/kyra/saveload_hof.cpp +++ b/engines/kyra/saveload_hof.cpp @@ -152,7 +152,7 @@ Common::Error KyraEngine_HoF::loadGameState(int slot) { int loadedZTable = _characterShapeFile; - Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, true); + Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES); _screen->hideMouse(); diff --git a/engines/kyra/saveload_lol.cpp b/engines/kyra/saveload_lol.cpp index e27c0431e2..23bde6edb7 100644 --- a/engines/kyra/saveload_lol.cpp +++ b/engines/kyra/saveload_lol.cpp @@ -54,7 +54,7 @@ Common::Error LoLEngine::loadGameState(int slot) { _screen->fillRect(112, 0, 287, 119, 0, 0); _screen->updateScreen(); - Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, true); + Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES); for (int i = 0; i < 4; i++) { LoLCharacter *c = &_characters[i]; diff --git a/engines/kyra/saveload_mr.cpp b/engines/kyra/saveload_mr.cpp index 16fbbdd902..88befc7f37 100644 --- a/engines/kyra/saveload_mr.cpp +++ b/engines/kyra/saveload_mr.cpp @@ -150,7 +150,7 @@ Common::Error KyraEngine_MR::loadGameState(int slot) { int curShapes = _characterShapeFile; - Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, true); + Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES); _screen->hideMouse(); diff --git a/engines/kyra/screen.cpp b/engines/kyra/screen.cpp index f190c6ab3d..5d5ad0be74 100644 --- a/engines/kyra/screen.cpp +++ b/engines/kyra/screen.cpp @@ -2969,7 +2969,7 @@ bool Screen::loadPaletteTable(const char *filename, int firstPalette) { } void Screen::loadPalette(const byte *data, Palette &pal, int bytes) { - Common::MemoryReadStream stream(data, bytes, false); + Common::MemoryReadStream stream(data, bytes, Common::DisposeAfterUse::NO); if (_isAmiga) pal.loadAmigaPalette(stream, 0, stream.size() / Palette::kAmigaBytesPerColor); diff --git a/engines/m4/compression.h b/engines/m4/compression.h index b00e75995b..938c14dd81 100644 --- a/engines/m4/compression.h +++ b/engines/m4/compression.h @@ -59,7 +59,7 @@ public: MadsPackEntry &getItem(int index) const { return _items[index]; } MadsPackEntry &operator[](int index) const { return _items[index]; } Common::MemoryReadStream *getItemStream(int index) { - return new Common::MemoryReadStream(_items[index].data, _items[index].size, false); + return new Common::MemoryReadStream(_items[index].data, _items[index].size, Common::DisposeAfterUse::NO); } int getDataOffset() const { return _dataOffset; } }; diff --git a/engines/made/redreader.cpp b/engines/made/redreader.cpp index ca3b2af644..303d6ff14b 100644 --- a/engines/made/redreader.cpp +++ b/engines/made/redreader.cpp @@ -45,7 +45,7 @@ Common::MemoryReadStream *RedReader::load(const char *redFilename, const char *f lzhDec->decompress(fd, fileBuf, fileEntry.compSize, fileEntry.origSize); delete lzhDec; - return new Common::MemoryReadStream(fileBuf, fileEntry.origSize, true); + return new Common::MemoryReadStream(fileBuf, fileEntry.origSize, Common::DisposeAfterUse::YES); } diff --git a/engines/parallaction/disk_ns.cpp b/engines/parallaction/disk_ns.cpp index 383937aa7e..cd036e87d0 100644 --- a/engines/parallaction/disk_ns.cpp +++ b/engines/parallaction/disk_ns.cpp @@ -133,7 +133,7 @@ Common::SeekableReadStream *NSArchive::createReadStreamForMember(const Common::S int offset = _archiveOffsets[index]; int endOffset = _archiveOffsets[index] + _archiveLenghts[index]; - return new Common::SeekableSubReadStream(_stream, offset, endOffset, false); + return new Common::SeekableSubReadStream(_stream, offset, endOffset, Common::DisposeAfterUse::NO); } bool NSArchive::hasFile(const Common::String &name) { @@ -670,7 +670,7 @@ public: ppDecrunchBuffer(src, dest, crlen-8, decrlen); free(src); - _stream = new Common::MemoryReadStream(dest, decrlen, true); + _stream = new Common::MemoryReadStream(dest, decrlen, Common::DisposeAfterUse::YES); _dispose = true; } diff --git a/engines/parallaction/font.cpp b/engines/parallaction/font.cpp index daa74cc7dc..eb8869b537 100644 --- a/engines/parallaction/font.cpp +++ b/engines/parallaction/font.cpp @@ -678,7 +678,7 @@ void Parallaction_ns::initFonts() { _introFont = _disk->loadFont("slide"); } else { _dialogueFont = _disk->loadFont("comic"); - Common::MemoryReadStream stream(_amigaTopazFont, 2600, false); + Common::MemoryReadStream stream(_amigaTopazFont, 2600, Common::DisposeAfterUse::NO); _labelFont = new AmigaFont(stream); _menuFont = _disk->loadFont("slide"); _introFont = _disk->loadFont("intro"); diff --git a/engines/saga/sound.cpp b/engines/saga/sound.cpp index 79e5cbeb87..c4bcea9c1a 100644 --- a/engines/saga/sound.cpp +++ b/engines/saga/sound.cpp @@ -83,17 +83,17 @@ void Sound::playSoundBuffer(Audio::SoundHandle *handle, SoundBuffer &buffer, int switch (buffer.soundType) { #ifdef USE_MAD case kSoundMP3: - stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true); + stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true); break; #endif #ifdef USE_VORBIS case kSoundOGG: - stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true); + stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true); break; #endif #ifdef USE_FLAC case kSoundFLAC: - stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, true), true); + stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true); break; #endif default: diff --git a/engines/sci/sfx/core.cpp b/engines/sci/sfx/core.cpp index e29560ba35..fe044e98ac 100644 --- a/engines/sci/sfx/core.cpp +++ b/engines/sci/sfx/core.cpp @@ -1156,10 +1156,10 @@ Audio::AudioStream* SfxState::getAudioStream(uint32 number, uint32 volume, int * if (audioRes->headerSize > 0) { // SCI1.1 - Common::MemoryReadStream headerStream(audioRes->header, audioRes->headerSize, false); + Common::MemoryReadStream headerStream(audioRes->header, audioRes->headerSize, Common::DisposeAfterUse::NO); if (readSOLHeader(&headerStream, audioRes->headerSize, size, _audioRate, audioFlags)) { - Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, false); + Common::MemoryReadStream dataStream(audioRes->data, audioRes->size, Common::DisposeAfterUse::NO); data = readSOLAudio(&dataStream, size, audioFlags, flags); } } else { diff --git a/engines/scumm/saveload.cpp b/engines/scumm/saveload.cpp index db56c44daf..6dd2ffc0a6 100644 --- a/engines/scumm/saveload.cpp +++ b/engines/scumm/saveload.cpp @@ -223,7 +223,7 @@ void ScummEngine_v4::prepareSavegame() { if (!writeStream->err()) { // wrap uncompressing MemoryReadStream around the savegame data _savePreparedSavegame = Common::wrapCompressedReadStream( - new Common::MemoryReadStream(memStream->getData(), memStream->size(), true)); + new Common::MemoryReadStream(memStream->getData(), memStream->size(), Common::DisposeAfterUse::YES)); } } // free the CompressedWriteStream and MemoryWriteStreamDynamic diff --git a/engines/sword2/music.cpp b/engines/sword2/music.cpp index fee75f7638..be3d6f4174 100644 --- a/engines/sword2/music.cpp +++ b/engines/sword2/music.cpp @@ -50,22 +50,23 @@ namespace Sword2 { -// This class behaves like SeekableSubReadStream, except it remembers where the -// previous read() or seek() took it, so that it can continue from that point -// the next time. This is because we're frequently streaming two pieces of -// music from the same file. - +/** + * This class behaves like SeekableSubReadStream, except it remembers where the + * previous read() or seek() took it, so that it can continue from that point + * the next time. This is because we're frequently streaming two pieces of + * music from the same file. + */ class SafeSubReadStream : public Common::SeekableSubReadStream { protected: uint32 _previousPos; public: - SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool disposeParentStream); + SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end); virtual uint32 read(void *dataPtr, uint32 dataSize); virtual bool seek(int32 offset, int whence = SEEK_SET); }; -SafeSubReadStream::SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool disposeParentStream) - : SeekableSubReadStream(parentStream, begin, end, disposeParentStream) { +SafeSubReadStream::SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end) + : SeekableSubReadStream(parentStream, begin, end, Common::DisposeAfterUse::NO) { _previousPos = 0; } @@ -197,17 +198,17 @@ static Audio::AudioStream *getAudioStream(SoundFileHandle *fh, const char *base, return makeCLUStream(&fh->file, enc_len); #ifdef USE_MAD case kMP3Mode: - tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false); + tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeMP3Stream(tmp, true); #endif #ifdef USE_VORBIS case kVorbisMode: - tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false); + tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeVorbisStream(tmp, true); #endif #ifdef USE_FLAC case kFlacMode: - tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len, false); + tmp = new SafeSubReadStream(&fh->file, pos, pos + enc_len); return Audio::makeFlacStream(tmp, true); #endif default: @@ -301,7 +302,7 @@ Audio::AudioStream *makePSXCLUStream(Common::File *file, int size) { byte *buffer = (byte *)malloc(size); file->read(buffer, size); - return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, true)); + return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, Common::DisposeAfterUse::YES)); } // ---------------------------------------------------------------------------- diff --git a/engines/teenagent/pack.cpp b/engines/teenagent/pack.cpp index 8e9ec9b5de..fc1918acb4 100644 --- a/engines/teenagent/pack.cpp +++ b/engines/teenagent/pack.cpp @@ -78,7 +78,7 @@ Common::SeekableReadStream *Pack::getStream(uint32 id) const { if (id < 1 || id > count) return 0; debug(0, "stream: %04x-%04x", offsets[id - 1], offsets[id]); - return new Common::SeekableSubReadStream(&file, offsets[id - 1], offsets[id], false); + return new Common::SeekableSubReadStream(&file, offsets[id - 1], offsets[id], Common::DisposeAfterUse::NO); } } // End of namespace TeenAgent diff --git a/engines/tinsel/music.cpp b/engines/tinsel/music.cpp index 6ce1ea7288..568bbbd637 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, true); + sampleStream = new Common::MemoryReadStream(buffer, sampleCLength, Common::DisposeAfterUse::YES); delete _curChunk; _curChunk = makeADPCMStream(sampleStream, true, sampleCLength, diff --git a/engines/tinsel/sound.cpp b/engines/tinsel/sound.cpp index ad7027c3e4..bc1ae8c6b9 100644 --- a/engines/tinsel/sound.cpp +++ b/engines/tinsel/sound.cpp @@ -133,7 +133,7 @@ bool SoundManager::playSample(int id, Audio::Mixer::SoundType type, Audio::Sound _vm->_mixer->setVolumeForSoundType(Audio::Mixer::kSpeechSoundType, volVoice); Common::MemoryReadStream *compressedStream = - new Common::MemoryReadStream(sampleBuf, sampleLen, true); + new Common::MemoryReadStream(sampleBuf, sampleLen, Common::DisposeAfterUse::YES); Audio::AudioStream *sampleStream = 0; // play it @@ -284,7 +284,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, true); + new Common::MemoryReadStream(sampleBuf, sampleLen, Common::DisposeAfterUse::YES); Audio::AudioStream *sampleStream = 0; switch (_soundMode) { |