Ticket #8973: ps2-trunk.patch

backends/platform/ps2/savefilemgr.h

@@ -26 +26 @@
 #ifndef __SAVEFILEMGR_H__
 #define __SAVEFILEMGR_H__
 
-// #include "common/savefile.h"
+//#include "common/savefile.h"
 #include "backends/saves/default/default-saves.h"
+#include "common/zlib.h"
 
 class Gs2dScreen;
 class OSystem_PS2;

backends/platform/ps2/savefilemgr.cpp

@@ -24 +24 @@
  */
 
 #include "common/config-manager.h"
-#include "backends/saves/compressed/compressed-saves.h"
+
 
 #ifdef __USE_LIBMC__
         #include <libmc.h>
@@ -124 +124 @@
                 if(!file.exists())
                         return NULL;
 
-                sf = file.openForReading();
+                sf = file.createReadStream ();
 
         } else {
                 Common::FSNode file = savePath.getChild(filename);
@@ -132 +132 @@
                 if(!file.exists())
                         return NULL;
 
-                sf = file.openForReading();
+                sf = file.createReadStream ();
         }
 
         // _screen->wantAnim(false);
 
-        return wrapInSaveFile(sf);
+        return Common::wrapCompressedReadStream(sf);
 }
 
 Common::OutSaveFile *Ps2SaveFileManager::openForSaving(const char *filename) {
@@ -177 +177 @@
                 }
 
                 Common::FSNode file(path);
-                sf = file.openForWriting();
+                sf = file.createWriteStream();
                 free(game);
                 free(ext);
         } else {
                 Common::FSNode file = savePath.getChild(filename);
-                sf = file.openForWriting();
+                sf = file.createWriteStream();
         }
 
         _screen->wantAnim(false);
-        return wrapOutSaveFile(sf);
+        return Common::wrapCompressedWriteStream(sf);
 }
 
 bool Ps2SaveFileManager::removeSavefile(const char *filename) {

backends/platform/ps2/systemps2.h

@@ -26 +26 @@
 #ifndef SYSTEMPS2_H
 #define SYSTEMPS2_H
 
-#include "common/system.h"
+#include "backends/base-backend.h"
+#include "graphics/colormasks.h"
+#include "backends/events/default/default-events.h"
 
 class DefaultTimerManager;
 class DefaultSaveFileManager;
@@ -53 +55 @@
         class MixerImpl;
 };
 
-class OSystem_PS2 : public OSystem {
+class OSystem_PS2 : public BaseBackend  {
 public:
         OSystem_PS2(const char *elfPath);
         virtual ~OSystem_PS2(void);
@@ -108 +110 @@
 
         virtual void quit();
 
-        virtual Common::SeekableReadStream *openConfigFileForReading();
-        virtual Common::WriteStream *openConfigFileForWriting();
+        virtual Common::SeekableReadStream *createConfigReadStream ();
+        virtual Common::WriteStream *createConfigWriteStream ();
 
         virtual Graphics::PixelFormat getOverlayFormat() const { return Graphics::createPixelFormat<1555>(); }
 
@@ -134 +136 @@
         bool runningFromHost(void);
         int getBootDevice() { return _bootDevice; }
 
+        virtual int16 getOverlayHeight()  { return getHeight(); }
+        virtual int16 getOverlayWidth()   { return getWidth(); }
+        
+
 private:
         void startIrxModules(int numModules, IrxReference *modules);
 

backends/platform/ps2/systemps2.cpp

@@ -945 +945 @@
         _configFile = strdup(path);
 }
 
-Common::SeekableReadStream *OSystem_PS2::openConfigFileForReading() {
+Common::SeekableReadStream *OSystem_PS2::createConfigReadStream () {
         Common::FSNode file(_configFile);
-        return file.openForReading();
+        return file.createReadStream();
 }
     
-Common::WriteStream *OSystem_PS2::openConfigFileForWriting() {
+Common::WriteStream *OSystem_PS2::createConfigWriteStream () {
         Common::FSNode file(_configFile);
-        return file.openForWriting();
+        return file.createWriteStream();
 }
+
+
+        

backends/fs/ps2/ps2-fs.cpp

@@ -111 +111 @@
         virtual bool getChildren(AbstractFSList &list, ListMode mode, bool hidden) const;
         virtual AbstractFSNode *getParent() const;
 
-        virtual Common::SeekableReadStream *openForReading();
-        virtual Common::WriteStream *openForWriting();
+        virtual Common::SeekableReadStream *createReadStream();
+        virtual Common::WriteStream *createWriteStream();
 
         int getDev() { return 0; };
 };
@@ -503 +503 @@
                 return "WTF ???";
 }
 
-Common::SeekableReadStream *Ps2FilesystemNode::openForReading() {
+Common::SeekableReadStream *Ps2FilesystemNode::createReadStream() {
         Common::SeekableReadStream *ss = StdioStream::makeFromPath(getPath().c_str(), false);
         return ss;
 }
 
-Common::WriteStream *Ps2FilesystemNode::openForWriting() {
+Common::WriteStream *Ps2FilesystemNode::createWriteStream() {
         return StdioStream::makeFromPath(getPath().c_str(), true);
 }