[Scummvm-cvs-logs] SF.net SVN: scummvm:[34277] scummvm/trunk/backends/platform/null/null.cpp

[lordhoto at users.sourceforge.net]

Revision: 34277
          http://scummvm.svn.sourceforge.net/scummvm/?rev=34277&view=rev
Author:   lordhoto
Date:     2008-09-02 13:13:02 +0000 (Tue, 02 Sep 2008)

Log Message:
-----------
Updated NULL backend for FS changes.

Modified Paths:
--------------
    scummvm/trunk/backends/platform/null/null.cpp

Modified: scummvm/trunk/backends/platform/null/null.cpp
===================================================================
--- scummvm/trunk/backends/platform/null/null.cpp	2008-09-02 13:11:54 UTC (rev 34276)
+++ scummvm/trunk/backends/platform/null/null.cpp	2008-09-02 13:13:02 UTC (rev 34277)
@@ -50,13 +50,12 @@
 	#include "backends/fs/windows/windows-fs-factory.h"
 #endif
 
-
-
 class OSystem_NULL : public OSystem {
 protected:
 	Common::SaveFileManager *_savefile;
 	Audio::MixerImpl *_mixer;
 	Common::TimerManager *_timer;
+	FilesystemFactory *_fsFactory;
 
 	timeval _startTime;
 public:
@@ -133,12 +132,23 @@
 	_savefile = 0;
 	_mixer = 0;
 	_timer = 0;
+
+	#if defined(__amigaos4__)
+		_fsFactory = new AmigaOSFilesystemFactory();
+	#elif defined(UNIX)
+		_fsFactory = new POSIXFilesystemFactory();
+	#elif defined(WIN32)
+		_fsFactory = new WindowsFilesystemFactory();
+	#else
+		#error Unknown and unsupported FS backend
+	#endif
 }
 
 OSystem_NULL::~OSystem_NULL() {
 	delete _savefile;
 	delete _mixer;
 	delete _timer;
+	delete _fsFactory;
 }
 
 void OSystem_NULL::initBackend() {
@@ -327,18 +337,9 @@
 }
 
 FilesystemFactory *OSystem_NULL::getFilesystemFactory() {
-	#if defined(__amigaos4__)
-		return &AmigaOSFilesystemFactory::instance();
-	#elif defined(UNIX)
-		return &POSIXFilesystemFactory::instance();
-	#elif defined(WIN32)
-		return &WindowsFilesystemFactory::instance();
-	#else
-		#error Unknown and unsupported backend in OSystem_NULL::getFilesystemFactory
-	#endif
+	return _fsFactory;
 }
 
-
 OSystem *OSystem_NULL_create() {
 	return new OSystem_NULL();
 }


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