[Scummvm-cvs-logs] SF.net SVN: scummvm:[47180] scummvm/trunk

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Fri Jan 8 23:07:35 CET 2010


Revision: 47180
          http://scummvm.svn.sourceforge.net/scummvm/?rev=47180&view=rev
Author:   fingolfin
Date:     2010-01-08 22:07:35 +0000 (Fri, 08 Jan 2010)

Log Message:
-----------
Move DisposeAfterUse::Flag from Common to global namespace, and into a new header common/types.h

Modified Paths:
--------------
    scummvm/trunk/common/stream.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/mohawk/bitmap.cpp
    scummvm/trunk/engines/mohawk/livingbooks.cpp
    scummvm/trunk/engines/mohawk/sound.cpp
    scummvm/trunk/engines/mohawk/video/qt_player.cpp
    scummvm/trunk/engines/parallaction/disk_ns.cpp
    scummvm/trunk/engines/parallaction/font.cpp
    scummvm/trunk/engines/saga/sound.cpp
    scummvm/trunk/engines/sci/sound/audio.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

Added Paths:
-----------
    scummvm/trunk/common/types.h

Modified: scummvm/trunk/common/stream.h
===================================================================
--- scummvm/trunk/common/stream.h	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/common/stream.h	2010-01-08 22:07:35 UTC (rev 47180)
@@ -26,7 +26,7 @@
 #ifndef COMMON_STREAM_H
 #define COMMON_STREAM_H
 
-#include "common/scummsys.h"
+#include "common/types.h"
 #include "common/endian.h"
 
 namespace Common {
@@ -391,10 +391,6 @@
 };
 
 
-namespace DisposeAfterUse {
-	enum Flag { NO, YES };
-}
-
 /**
  * SubReadStream provides access to a ReadStream restricted to the range
  * [currentPosition, currentPosition+end).

Added: scummvm/trunk/common/types.h
===================================================================
--- scummvm/trunk/common/types.h	                        (rev 0)
+++ scummvm/trunk/common/types.h	2010-01-08 22:07:35 UTC (rev 47180)
@@ -0,0 +1,35 @@
+/* ScummVM - Graphic Adventure Engine
+ *
+ * ScummVM is the legal property of its developers, whose names
+ * are too numerous to list here. Please refer to the COPYRIGHT
+ * file distributed with this source distribution.
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
+ *
+ * $URL$
+ * $Id$
+ */
+
+#ifndef COMMON_TYPES_H
+#define COMMON_TYPES_H
+
+#include "common/scummsys.h"
+
+namespace DisposeAfterUse {
+	enum Flag { NO, YES };
+}
+
+
+#endif


Property changes on: scummvm/trunk/common/types.h
___________________________________________________________________
Added: svn:mime-type
   + text/plain
Added: svn:keywords
   + Date Rev Author URL Id
Added: svn:eol-style
   + native

Modified: scummvm/trunk/engines/agi/sound.cpp
===================================================================
--- scummvm/trunk/engines/agi/sound.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/agi/sound.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -84,7 +84,7 @@
 }
 
 IIgsSample::IIgsSample(uint8 *data, uint32 len, int resnum, SoundMgr &manager) : AgiSound(manager) {
-	Common::MemoryReadStream stream(data, len, Common::DisposeAfterUse::YES);
+	Common::MemoryReadStream stream(data, len, 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	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/cruise/overlay.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -209,7 +209,7 @@
 
 	debug(1, "OVL loading done...");
 
-	Common::MemoryReadStream s(unpackedBuffer, unpackedSize, Common::DisposeAfterUse::YES);
+	Common::MemoryReadStream s(unpackedBuffer, unpackedSize, DisposeAfterUse::YES);
 	unpackedBuffer = NULL;
 
 	ovlData = overlayTable[scriptIdx].ovlData;
@@ -590,7 +590,7 @@
 			loadPackedFileToMem(fileIdx, (uint8 *) unpackedBuffer);
 		}
 
-		Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, Common::DisposeAfterUse::YES);
+		Common::MemoryReadStream s2(unpackedBuffer, unpackedSize, DisposeAfterUse::YES);
 		unpackedBuffer = NULL;
 
 		ovlData->specialString1Length = s2.readUint16BE();

Modified: scummvm/trunk/engines/groovie/resource.cpp
===================================================================
--- scummvm/trunk/engines/groovie/resource.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/groovie/resource.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -65,7 +65,7 @@
 	}
 
 	// Returning the resource substream
-	return new Common::SeekableSubReadStream(gjdFile, resInfo.offset, resInfo.offset + resInfo.size, Common::DisposeAfterUse::YES);
+	return new Common::SeekableSubReadStream(gjdFile, resInfo.offset, resInfo.offset + resInfo.size, DisposeAfterUse::YES);
 }
 
 

Modified: scummvm/trunk/engines/groovie/saveload.cpp
===================================================================
--- scummvm/trunk/engines/groovie/saveload.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/groovie/saveload.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -138,7 +138,7 @@
 	}
 
 	// Return a substream, skipping the metadata
-	Common::SeekableSubReadStream *sub = new Common::SeekableSubReadStream(savefile, metaDataSize, savefile->size(), Common::DisposeAfterUse::YES);
+	Common::SeekableSubReadStream *sub = new Common::SeekableSubReadStream(savefile, metaDataSize, savefile->size(), 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	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/kyra/resource_intern.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -78,7 +78,7 @@
 	if (!parent)
 		return 0;
 
-	return new Common::SeekableSubReadStream(parent, fDesc->_value.offset, fDesc->_value.offset + fDesc->_value.size, Common::DisposeAfterUse::YES);
+	return new Common::SeekableSubReadStream(parent, fDesc->_value.offset, fDesc->_value.offset + fDesc->_value.size, DisposeAfterUse::YES);
 }
 
 // -> CachedArchive implementation
@@ -130,7 +130,7 @@
 	if (fDesc == _files.end())
 		return 0;
 
-	return new Common::MemoryReadStream(fDesc->_value.data, fDesc->_value.size, Common::DisposeAfterUse::NO);
+	return new Common::MemoryReadStream(fDesc->_value.data, fDesc->_value.size, DisposeAfterUse::NO);
 }
 
 // ResFileLoader implementations

Modified: scummvm/trunk/engines/kyra/saveload_hof.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_hof.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/kyra/saveload_hof.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -152,7 +152,7 @@
 
 	int loadedZTable = _characterShapeFile;
 
-	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES);
+	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
 
 	_screen->hideMouse();
 

Modified: scummvm/trunk/engines/kyra/saveload_lol.cpp
===================================================================
--- scummvm/trunk/engines/kyra/saveload_lol.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/kyra/saveload_lol.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -54,7 +54,7 @@
 	_screen->fillRect(112, 0, 287, 119, 0, 0);
 	_screen->updateScreen();
 
-	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES);
+	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, 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	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/kyra/saveload_mr.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -150,7 +150,7 @@
 
 	int curShapes = _characterShapeFile;
 
-	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, Common::DisposeAfterUse::YES);
+	Common::SeekableSubReadStreamEndian in(saveFile, saveFile->pos(), saveFile->size(), !header.originalSave, DisposeAfterUse::YES);
 
 	_screen->hideMouse();
 

Modified: scummvm/trunk/engines/kyra/screen.cpp
===================================================================
--- scummvm/trunk/engines/kyra/screen.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/kyra/screen.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -2969,7 +2969,7 @@
 }
 
 void Screen::loadPalette(const byte *data, Palette &pal, int bytes) {
-	Common::MemoryReadStream stream(data, bytes, Common::DisposeAfterUse::NO);
+	Common::MemoryReadStream stream(data, bytes, 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	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/m4/compression.h	2010-01-08 22:07:35 UTC (rev 47180)
@@ -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, Common::DisposeAfterUse::NO);
+		return new Common::MemoryReadStream(_items[index].data, _items[index].size, DisposeAfterUse::NO);
 	}
 	int getDataOffset() const { return _dataOffset; }
 };

Modified: scummvm/trunk/engines/made/redreader.cpp
===================================================================
--- scummvm/trunk/engines/made/redreader.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/made/redreader.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -45,7 +45,7 @@
 	lzhDec->decompress(fd, fileBuf, fileEntry.compSize, fileEntry.origSize);
 	delete lzhDec;
 
-	return new Common::MemoryReadStream(fileBuf, fileEntry.origSize, Common::DisposeAfterUse::YES);
+	return new Common::MemoryReadStream(fileBuf, fileEntry.origSize, DisposeAfterUse::YES);
 
 }
 

Modified: scummvm/trunk/engines/mohawk/bitmap.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/bitmap.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/mohawk/bitmap.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -247,7 +247,7 @@
 		}
 	}
 
-	return new Common::MemoryReadStream(outputData, uncompressedSize, Common::DisposeAfterUse::YES);
+	return new Common::MemoryReadStream(outputData, uncompressedSize, DisposeAfterUse::YES);
 }
 
 void MohawkBitmap::unpackLZ() {
@@ -316,7 +316,7 @@
 	}
 
 	delete _data;
-	_data = new Common::MemoryReadStream(uncompressedData, _header.bytesPerRow * _header.height, Common::DisposeAfterUse::YES);
+	_data = new Common::MemoryReadStream(uncompressedData, _header.bytesPerRow * _header.height, DisposeAfterUse::YES);
 }
 
 static byte getLastTwoBits(byte c) {

Modified: scummvm/trunk/engines/mohawk/livingbooks.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/mohawk/livingbooks.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -263,7 +263,7 @@
 
 Common::SeekableSubReadStreamEndian *MohawkEngine_LivingBooks::wrapStreamEndian(uint32 tag, uint16 id) {
 	Common::SeekableReadStream *dataStream = getRawData(tag, id);
-	return new Common::SeekableSubReadStreamEndian(dataStream, 0, dataStream->size(), isBigEndian(), Common::DisposeAfterUse::YES);
+	return new Common::SeekableSubReadStreamEndian(dataStream, 0, dataStream->size(), isBigEndian(), DisposeAfterUse::YES);
 }
 
 Common::String MohawkEngine_LivingBooks::getStringFromConfig(Common::String section, Common::String key) {

Modified: scummvm/trunk/engines/mohawk/sound.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/sound.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/mohawk/sound.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -441,13 +441,13 @@
 			flags |= Audio::Mixer::FLAG_LOOP;
 		return Audio::makeLinearInputStream(data_chunk.audio_data, data_chunk.size, data_chunk.sample_rate, flags, data_chunk.loopStart, data_chunk.loopEnd);
 	} else if (data_chunk.encoding == kCodecADPCM) {
-		Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, Common::DisposeAfterUse::YES);
+		Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES);
 		uint32 blockAlign = data_chunk.channels * data_chunk.bitsPerSample / 8;
 
 		return makeLoopingAudioStream(Audio::makeADPCMStream(dataStream, true, data_chunk.size, Audio::kADPCMIma, data_chunk.sample_rate, data_chunk.channels, blockAlign), loop ? 0 : 1);
 	} else if (data_chunk.encoding == kCodecMPEG2) {
 #ifdef USE_MAD
-		Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, Common::DisposeAfterUse::YES);
+		Common::MemoryReadStream *dataStream = new Common::MemoryReadStream(data_chunk.audio_data, data_chunk.size, DisposeAfterUse::YES);
 		return Audio::makeLoopingAudioStream(Audio::makeMP3Stream(dataStream, true), loop ? 0 : 1);
 #else
 		warning ("MAD library not included - unable to play MP2 audio");

Modified: scummvm/trunk/engines/mohawk/video/qt_player.cpp
===================================================================
--- scummvm/trunk/engines/mohawk/video/qt_player.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/mohawk/video/qt_player.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -467,7 +467,7 @@
 	
 	// Load data into a new MemoryReadStream and assign _fd to be that
 	Common::SeekableReadStream *oldStream = _fd;
-	_fd = new Common::MemoryReadStream(uncompressedData, uncompressedSize, Common::DisposeAfterUse::YES);
+	_fd = new Common::MemoryReadStream(uncompressedData, uncompressedSize, DisposeAfterUse::YES);
 	
 	// Read the contents of the uncompressed data
 	MOVatom a = { MKID_BE('moov'), 0, uncompressedSize };
@@ -1224,7 +1224,7 @@
 		}
 	
 		// Now queue the buffer
-		_audStream->queueAudioStream(createAudioStream(new Common::MemoryReadStream(wStream->getData(), wStream->size(), Common::DisposeAfterUse::YES)));
+		_audStream->queueAudioStream(createAudioStream(new Common::MemoryReadStream(wStream->getData(), wStream->size(), DisposeAfterUse::YES)));
 		delete wStream;
 	}
 }

Modified: scummvm/trunk/engines/parallaction/disk_ns.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/disk_ns.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/parallaction/disk_ns.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -133,7 +133,7 @@
 
 	int offset = _archiveOffsets[index];
 	int endOffset = _archiveOffsets[index] + _archiveLenghts[index];
-	return new Common::SeekableSubReadStream(_stream, offset, endOffset, Common::DisposeAfterUse::NO);
+	return new Common::SeekableSubReadStream(_stream, offset, endOffset, 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, Common::DisposeAfterUse::YES);
+		_stream = new Common::MemoryReadStream(dest, decrlen, DisposeAfterUse::YES);
 		_dispose = true;
 	}
 

Modified: scummvm/trunk/engines/parallaction/font.cpp
===================================================================
--- scummvm/trunk/engines/parallaction/font.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/parallaction/font.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -678,7 +678,7 @@
 		_introFont = _disk->loadFont("slide");
 	} else {
 		_dialogueFont = _disk->loadFont("comic");
-		Common::MemoryReadStream stream(_amigaTopazFont, 2600, Common::DisposeAfterUse::NO);
+		Common::MemoryReadStream stream(_amigaTopazFont, 2600, 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	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/saga/sound.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -83,17 +83,17 @@
 		switch (buffer.soundType) {
 #ifdef USE_MAD
 			case kSoundMP3:
-				stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true);
+				stream = Audio::makeMP3Stream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
 				break;
 #endif
 #ifdef USE_VORBIS
 			case kSoundOGG:
-				stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true);
+				stream = Audio::makeVorbisStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
 				break;
 #endif
 #ifdef USE_FLAC
 			case kSoundFLAC:
-				stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, Common::DisposeAfterUse::YES), true);
+				stream = Audio::makeFlacStream(new Common::MemoryReadStream(buffer.buffer, buffer.size, DisposeAfterUse::YES), true);
 				break;
 #endif
 			default:

Modified: scummvm/trunk/engines/sci/sound/audio.cpp
===================================================================
--- scummvm/trunk/engines/sci/sound/audio.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/sci/sound/audio.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -218,10 +218,10 @@
 
 	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 @@
 		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);
 			}
 		}

Modified: scummvm/trunk/engines/scumm/saveload.cpp
===================================================================
--- scummvm/trunk/engines/scumm/saveload.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/scumm/saveload.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -223,7 +223,7 @@
 		if (!writeStream->err()) {
 			// wrap uncompressing MemoryReadStream around the savegame data
 			_savePreparedSavegame = Common::wrapCompressedReadStream(
-				new Common::MemoryReadStream(memStream->getData(), memStream->size(), Common::DisposeAfterUse::YES));
+				new Common::MemoryReadStream(memStream->getData(), memStream->size(), DisposeAfterUse::YES));
 		}
 	}
 	// free the CompressedWriteStream and MemoryWriteStreamDynamic

Modified: scummvm/trunk/engines/sword2/music.cpp
===================================================================
--- scummvm/trunk/engines/sword2/music.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/sword2/music.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -66,7 +66,7 @@
 };
 
 SafeSubReadStream::SafeSubReadStream(SeekableReadStream *parentStream, uint32 begin, uint32 end)
-	: SeekableSubReadStream(parentStream, begin, end, Common::DisposeAfterUse::NO) {
+	: SeekableSubReadStream(parentStream, begin, end, DisposeAfterUse::NO) {
 	_previousPos = 0;
 }
 
@@ -302,7 +302,7 @@
 
 	byte *buffer = (byte *)malloc(size);
 	file->read(buffer, size);
-	return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, Common::DisposeAfterUse::YES));
+	return new Audio::VagStream(new Common::MemoryReadStream(buffer, size, DisposeAfterUse::YES));
 }
 
 // ----------------------------------------------------------------------------

Modified: scummvm/trunk/engines/teenagent/pack.cpp
===================================================================
--- scummvm/trunk/engines/teenagent/pack.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/teenagent/pack.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -81,7 +81,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], Common::DisposeAfterUse::NO);
+	return new Common::SeekableSubReadStream(&file, offsets[id - 1], offsets[id], DisposeAfterUse::NO);
 }
 
 } // End of namespace TeenAgent

Modified: scummvm/trunk/engines/tinsel/music.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/music.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/tinsel/music.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -874,7 +874,7 @@
 				"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,

Modified: scummvm/trunk/engines/tinsel/sound.cpp
===================================================================
--- scummvm/trunk/engines/tinsel/sound.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/engines/tinsel/sound.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -132,7 +132,7 @@
 		_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 @@
 		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) {

Modified: scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp
===================================================================
--- scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2010-01-08 22:06:04 UTC (rev 47179)
+++ scummvm/trunk/graphics/video/coktelvideo/coktelvideo.cpp	2010-01-08 22:07:35 UTC (rev 47180)
@@ -2336,7 +2336,7 @@
 	}
 
 	Common::MemoryReadStream *stream =
-		new Common::MemoryReadStream(data, _extraData[i].realSize, Common::DisposeAfterUse::YES);
+		new Common::MemoryReadStream(data, _extraData[i].realSize, DisposeAfterUse::YES);
 
 	return stream;
 }


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