[Scummvm-cvs-logs] SF.net SVN: scummvm:[52722] scummvm/trunk/backends/fs/psp

[Bluddy at users.sourceforge.net]

Revision: 52722
          http://scummvm.svn.sourceforge.net/scummvm/?rev=52722&view=rev
Author:   Bluddy
Date:     2010-09-14 14:00:15 +0000 (Tue, 14 Sep 2010)

Log Message:
-----------
PSP: remove virtual inheritance of BufferedWriteStream and BufferedSeekableReadStream

As Max pointed out to me, one can't really use virtual functions called from constructors/destructors.

Modified Paths:
--------------
    scummvm/trunk/backends/fs/psp/psp-fs.cpp
    scummvm/trunk/backends/fs/psp/psp-stream.h

Modified: scummvm/trunk/backends/fs/psp/psp-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-fs.cpp	2010-09-14 12:47:42 UTC (rev 52721)
+++ scummvm/trunk/backends/fs/psp/psp-fs.cpp	2010-09-14 14:00:15 UTC (rev 52722)
@@ -251,7 +251,7 @@
 	
 	Common::SeekableReadStream *stream = PspIoStream::makeFromPath(getPath(), false);
 	
-	return new PspIoBufferedReadStream(stream, READ_BUFFER_SIZE, DisposeAfterUse::YES);
+	return new Common::BufferedSeekableReadStream(stream, READ_BUFFER_SIZE, DisposeAfterUse::YES);
 }
 
 Common::WriteStream *PSPFilesystemNode::createWriteStream() {
@@ -259,7 +259,7 @@
 	
 	Common::WriteStream *stream = PspIoStream::makeFromPath(getPath(), true);
 	
-	return new PspIoBufferedWriteStream(stream, WRITE_BUFFER_SIZE, DisposeAfterUse::YES);
+	return new Common::BufferedWriteStream(stream, WRITE_BUFFER_SIZE, DisposeAfterUse::YES);
 }
 
 #endif //#ifdef __PSP__

Modified: scummvm/trunk/backends/fs/psp/psp-stream.h
===================================================================
--- scummvm/trunk/backends/fs/psp/psp-stream.h	2010-09-14 12:47:42 UTC (rev 52721)
+++ scummvm/trunk/backends/fs/psp/psp-stream.h	2010-09-14 14:00:15 UTC (rev 52722)
@@ -33,22 +33,6 @@
 #include "common/stream.h"
 #include "common/str.h"
 
-class PspIoBufferedReadStream : public Common::BufferedSeekableReadStream {
-public:
-	PspIoBufferedReadStream(SeekableReadStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::YES) : BufferedSeekableReadStream(parentStream, bufSize, disposeParentStream) {}
-protected:	
-	virtual void allocBuf(uint32 bufSize) { _buf = (byte *)memalign(64, bufSize); }	// want 64 byte alignment for cache
-	virtual void deallocBuf() { free(_buf); }	
-};
-
-class PspIoBufferedWriteStream : public Common::BufferedWriteStream {
-public:
-	PspIoBufferedWriteStream(WriteStream *parentStream, uint32 bufSize, DisposeAfterUse::Flag disposeParentStream = DisposeAfterUse::YES) : BufferedWriteStream(parentStream, bufSize, disposeParentStream) {}
-protected:	
-	virtual void allocBuf(uint32 bufSize) { _buf = (byte *)memalign(64, bufSize); }
-	virtual void deallocBuf() { free(_buf); }
-};
-
 /**
  *  Class to handle special suspend/resume needs of PSP IO Streams
  */


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.