[Scummvm-cvs-logs] SF.net SVN: scummvm:[45233] scummvm/trunk
fingolfin at users.sourceforge.net
fingolfin at users.sourceforge.net
Sun Oct 18 21:41:59 CEST 2009
Revision: 45233
http://scummvm.svn.sourceforge.net/scummvm/?rev=45233&view=rev
Author: fingolfin
Date: 2009-10-18 19:41:59 +0000 (Sun, 18 Oct 2009)
Log Message:
-----------
Introduced new type Common::DisposeAfterUse::Flag
Modified Paths:
--------------
scummvm/trunk/common/stream.cpp
scummvm/trunk/common/stream.h
scummvm/trunk/common/unarj.cpp
scummvm/trunk/common/unzip.cpp
scummvm/trunk/common/xmlparser.cpp
scummvm/trunk/common/xmlparser.h
scummvm/trunk/engines/agi/sound.cpp
scummvm/trunk/engines/cruise/overlay.cpp
scummvm/trunk/engines/groovie/resource.cpp
scummvm/trunk/engines/groovie/saveload.cpp
scummvm/trunk/engines/kyra/resource_intern.cpp
scummvm/trunk/engines/kyra/saveload_hof.cpp
scummvm/trunk/engines/kyra/saveload_lol.cpp
scummvm/trunk/engines/kyra/saveload_mr.cpp
scummvm/trunk/engines/kyra/screen.cpp
scummvm/trunk/engines/m4/compression.h
scummvm/trunk/engines/made/redreader.cpp
scummvm/trunk/engines/parallaction/disk_ns.cpp
scummvm/trunk/engines/parallaction/font.cpp
scummvm/trunk/engines/saga/sound.cpp
scummvm/trunk/engines/sci/sfx/core.cpp
scummvm/trunk/engines/scumm/saveload.cpp
scummvm/trunk/engines/sword2/music.cpp
scummvm/trunk/engines/teenagent/pack.cpp
scummvm/trunk/engines/tinsel/music.cpp
scummvm/trunk/engines/tinsel/sound.cpp
scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
scummvm/trunk/gui/ThemeEngine.cpp
Modified: scummvm/trunk/common/stream.cpp
===================================================================
--- scummvm/trunk/common/stream.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/stream.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -37,7 +37,7 @@
void *buf = malloc(dataSize);
dataSize = read(buf, dataSize);
assert(dataSize > 0);
- return new MemoryReadStream((byte *)buf, dataSize, true);
+ return new MemoryReadStream((byte *)buf, dataSize, DisposeAfterUse::YES);
}
@@ -188,7 +188,7 @@
return dataSize;
}
-SeekableSubReadStream::SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool disposeParentStream)
+SeekableSubReadStream::SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream)
: SubReadStream(parentStream, end, disposeParentStream),
_parentStream(parentStream),
_begin(begin) {
@@ -222,7 +222,7 @@
return ret;
}
-BufferedReadStream::BufferedReadStream(ReadStream *parentStream, uint32 bufSize, bool disposeParentStream)
+BufferedReadStream::BufferedReadStream(ReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream)
: _parentStream(parentStream),
_disposeParentStream(disposeParentStream),
_pos(0),
@@ -279,7 +279,7 @@
return alreadyRead + dataSize;
}
-BufferedSeekableReadStream::BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, bool disposeParentStream)
+BufferedSeekableReadStream::BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream)
: BufferedReadStream(parentStream, bufSize, disposeParentStream),
_parentStream(parentStream) {
}
Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/stream.h 2009-10-18 19:41:59 UTC (rev 45233)
@@ -396,6 +396,11 @@
virtual String readLine();
};
+
+namespace DisposeAfterUse {
+ enum Flag { NO, YES };
+}
+
/**
* SubReadStream provides access to a ReadStream restricted to the range
* [currentPosition, currentPosition+end).
@@ -407,12 +412,12 @@
class SubReadStream : virtual public ReadStream {
protected:
ReadStream *_parentStream;
- bool _disposeParentStream;
+ DisposeAfterUse::Flag _disposeParentStream;
uint32 _pos;
uint32 _end;
bool _eos;
public:
- SubReadStream(ReadStream *parentStream, uint32 end, bool disposeParentStream = false)
+ SubReadStream(ReadStream *parentStream, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
: _parentStream(parentStream),
_disposeParentStream(disposeParentStream),
_pos(0),
@@ -421,7 +426,8 @@
assert(parentStream);
}
~SubReadStream() {
- if (_disposeParentStream) delete _parentStream;
+ if (_disposeParentStream)
+ delete _parentStream;
}
virtual bool eos() const { return _eos; }
@@ -443,7 +449,7 @@
SeekableReadStream *_parentStream;
uint32 _begin;
public:
- SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool disposeParentStream = false);
+ SeekableSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO);
virtual int32 pos() const { return _pos - _begin; }
virtual int32 size() const { return _end - _begin; }
@@ -463,7 +469,7 @@
const bool _bigEndian;
public:
- SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian = false, bool disposeParentStream = false)
+ SeekableSubReadStreamEndian(SeekableReadStream *parentStream, uint32 begin, uint32 end, bool bigEndian = false, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO)
: SeekableSubReadStream(parentStream, begin, end, disposeParentStream), _bigEndian(bigEndian) {
}
@@ -496,14 +502,14 @@
class BufferedReadStream : virtual public ReadStream {
protected:
ReadStream *_parentStream;
- bool _disposeParentStream;
+ DisposeAfterUse::Flag _disposeParentStream;
byte *_buf;
uint32 _pos;
uint32 _bufSize;
uint32 _realBufSize;
public:
- BufferedReadStream(ReadStream *parentStream, uint32 bufSize, bool disposeParentStream = false);
+ BufferedReadStream(ReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO);
~BufferedReadStream();
virtual bool eos() const { return (_pos == _bufSize) && _parentStream->eos(); }
@@ -521,7 +527,7 @@
protected:
SeekableReadStream *_parentStream;
public:
- BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, bool disposeParentStream = false);
+ BufferedSeekableReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::NO);
virtual int32 pos() const { return _parentStream->pos() - (_bufSize - _pos); }
virtual int32 size() const { return _parentStream->size(); }
@@ -542,7 +548,7 @@
const uint32 _size;
uint32 _pos;
byte _encbyte;
- bool _disposeMemory;
+ DisposeAfterUse::Flag _disposeMemory;
bool _eos;
public:
@@ -552,7 +558,7 @@
* wraps it. If disposeMemory is true, the MemoryReadStream takes ownership
* of the buffer and hence free's it when destructed.
*/
- MemoryReadStream(const byte *dataPtr, uint32 dataSize, bool disposeMemory = false) :
+ MemoryReadStream(const byte *dataPtr, uint32 dataSize, DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO) :
_ptrOrig(dataPtr),
_ptr(dataPtr),
_size(dataSize),
@@ -649,7 +655,7 @@
byte *_ptr;
byte *_data;
uint32 _pos;
- bool _disposeMemory;
+ DisposeAfterUse::Flag _disposeMemory;
void ensureCapacity(uint32 new_len) {
if (new_len <= _capacity)
@@ -670,7 +676,7 @@
_size = new_len;
}
public:
- MemoryWriteStreamDynamic(bool disposeMemory = false) : _capacity(0), _size(0), _ptr(0), _data(0), _pos(0), _disposeMemory(disposeMemory) {}
+ MemoryWriteStreamDynamic(DisposeAfterUse::Flag disposeMemory = DisposeAfterUse::NO) : _capacity(0), _size(0), _ptr(0), _data(0), _pos(0), _disposeMemory(disposeMemory) {}
~MemoryWriteStreamDynamic() {
if (_disposeMemory)
Modified: scummvm/trunk/common/unarj.cpp
===================================================================
--- scummvm/trunk/common/unarj.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/unarj.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -379,7 +379,7 @@
// If reading from archiveFile directly is too slow to be usable,
// maybe the filesystem code should instead wrap its files
// in a BufferedReadStream.
- decoder->_compressed = new BufferedReadStream(&archiveFile, 4096, false);
+ decoder->_compressed = new BufferedReadStream(&archiveFile, 4096);
decoder->_outstream = new MemoryWriteStream(uncompressedData, hdr->origSize);
if (hdr->method == 1 || hdr->method == 2 || hdr->method == 3)
@@ -391,7 +391,7 @@
}
- _uncompressed = new MemoryReadStream(uncompressedData, hdr->origSize, true);
+ _uncompressed = new MemoryReadStream(uncompressedData, hdr->origSize, DisposeAfterUse::YES);
assert(_uncompressed);
return true;
Modified: scummvm/trunk/common/unzip.cpp
===================================================================
--- scummvm/trunk/common/unzip.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/unzip.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -1442,7 +1442,7 @@
assert(buffer);
unzReadCurrentFile(_zipFile, buffer, fileInfo.uncompressed_size);
unzCloseCurrentFile(_zipFile);
- return new Common::MemoryReadStream(buffer, fileInfo.uncompressed_size+1, true);
+ return new Common::MemoryReadStream(buffer, fileInfo.uncompressed_size+1, DisposeAfterUse::YES);
// FIXME: instead of reading all into a memory stream, we could
// instead create a new ZipStream class. But then we have to be
Modified: scummvm/trunk/common/xmlparser.cpp
===================================================================
--- scummvm/trunk/common/xmlparser.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/xmlparser.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -48,7 +48,7 @@
return true;
}
-bool XMLParser::loadBuffer(const byte *buffer, uint32 size, bool disposable) {
+bool XMLParser::loadBuffer(const byte *buffer, uint32 size, DisposeAfterUse::Flag disposable) {
_stream = new MemoryReadStream(buffer, size, disposable);
_fileName = "Memory Stream";
return true;
Modified: scummvm/trunk/common/xmlparser.h
===================================================================
--- scummvm/trunk/common/xmlparser.h 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/common/xmlparser.h 2009-10-18 19:41:59 UTC (rev 45233)
@@ -198,7 +198,7 @@
* i.e. if it can be freed safely after it's
* no longer needed by the parser.
*/
- bool loadBuffer(const byte *buffer, uint32 size, bool disposable = false);
+ bool loadBuffer(const byte *buffer, uint32 size, DisposeAfterUse::Flag disposable = DisposeAfterUse::NO);
bool loadStream(Common::SeekableReadStream *stream);
Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/agi/sound.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -89,7 +89,7 @@
}
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
Modified: scummvm/trunk/engines/cruise/overlay.cpp
===================================================================
--- scummvm/trunk/engines/cruise/overlay.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/cruise/overlay.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -209,7 +209,7 @@
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 @@
loadPackedFileToMem(fileIdx, (uint8 *) unpackedBuffer);
}
- Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, true);
+ Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, Common::DisposeAfterUse::YES);
unpackedBuffer = NULL;
ovlData->specialString1Length = s2.readUint16BE();
Modified: scummvm/trunk/engines/groovie/resource.cpp
===================================================================
--- scummvm/trunk/engines/groovie/resource.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/groovie/resource.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -65,7 +65,7 @@
}
// 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);
}
Modified: scummvm/trunk/engines/groovie/saveload.cpp
===================================================================
--- scummvm/trunk/engines/groovie/saveload.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/groovie/saveload.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -138,7 +138,7 @@
}
// 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);
Modified: scummvm/trunk/engines/kyra/resource_intern.cpp
===================================================================
--- scummvm/trunk/engines/kyra/resource_intern.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/kyra/resource_intern.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -78,7 +78,7 @@
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 @@
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
Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -152,7 +152,7 @@
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();
Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -54,7 +54,7 @@
_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];
Modified: scummvm/trunk/engines/kyra/saveload_mr.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -150,7 +150,7 @@
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();
Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/kyra/screen.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -2969,7 +2969,7 @@
}
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);
Modified: scummvm/trunk/engines/m4/compression.h
===================================================================
--- scummvm/trunk/engines/m4/compression.h 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/m4/compression.h 2009-10-18 19:41:59 UTC (rev 45233)
@@ -59,7 +59,7 @@
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; }
};
Modified: scummvm/trunk/engines/made/redreader.cpp
===================================================================
--- scummvm/trunk/engines/made/redreader.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/made/redreader.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -45,7 +45,7 @@
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);
}
Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -133,7 +133,7 @@
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 @@
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;
}
Modified: scummvm/trunk/engines/parallaction/font.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/font.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/parallaction/font.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -678,7 +678,7 @@
_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");
Modified: scummvm/trunk/engines/saga/sound.cpp
===================================================================
--- scummvm/trunk/engines/saga/sound.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/saga/sound.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -83,17 +83,17 @@
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:
Modified: scummvm/trunk/engines/sci/sfx/core.cpp
===================================================================
--- scummvm/trunk/engines/sci/sfx/core.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/sci/sfx/core.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -1156,10 +1156,10 @@
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 {
Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/scumm/saveload.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -223,7 +223,7 @@
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
Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/sword2/music.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -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 @@
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 @@
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));
}
// ----------------------------------------------------------------------------
Modified: scummvm/trunk/engines/teenagent/pack.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/pack.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/teenagent/pack.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -78,7 +78,7 @@
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
Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/tinsel/music.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -874,7 +874,7 @@
"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,
Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/engines/tinsel/sound.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -133,7 +133,7 @@
_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 @@
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) {
Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -2311,7 +2311,7 @@
}
Common::MemoryReadStream *stream =
- new Common::MemoryReadStream(data, _extraData[i].realSize, true);
+ new Common::MemoryReadStream(data, _extraData[i].realSize, Common::DisposeAfterUse::YES);
return stream;
}
Modified: scummvm/trunk/gui/ThemeEngine.cpp
===================================================================
--- scummvm/trunk/gui/ThemeEngine.cpp 2009-10-18 19:29:50 UTC (rev 45232)
+++ scummvm/trunk/gui/ThemeEngine.cpp 2009-10-18 19:41:59 UTC (rev 45233)
@@ -696,7 +696,7 @@
#include "themes/default.inc"
;
- if (!_parser->loadBuffer((const byte*)defaultXML, strlen(defaultXML), false))
+ if (!_parser->loadBuffer((const byte*)defaultXML, strlen(defaultXML)))
return false;
_themeName = "ScummVM Classic Theme (Builtin Version)";
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the Scummvm-git-logs
mailing list