[Scummvm-cvs-logs] SF.net SVN: scummvm: [31364] scummvm/trunk/backends
anotherguest at users.sourceforge.net
anotherguest at users.sourceforge.net
Wed Apr 2 23:19:17 CEST 2008
Revision: 31364
http://scummvm.svn.sourceforge.net/scummvm/?rev=31364&view=rev
Author: anotherguest
Date: 2008-04-02 14:19:17 -0700 (Wed, 02 Apr 2008)
Log Message:
-----------
Remove Symbian FS creation from common SDL code
Modified Paths:
--------------
scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
scummvm/trunk/backends/platform/sdl/sdl.cpp
scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
Modified: scummvm/trunk/backends/fs/symbian/symbian-fs.cpp
===================================================================
--- scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/fs/symbian/symbian-fs.cpp 2008-04-02 21:19:17 UTC (rev 31364)
@@ -106,12 +106,12 @@
*
* @param path String with the path to be fixed.
*/
-static void fixFilePath(Common::String& path) {
- TInt len = path.size();
+static void fixFilePath(Common::String& aPath){
+ TInt len = aPath.size();
for (TInt index = 0; index < len; index++) {
- if (path[index] == '/') {
- path[index] = '\\';
+ if (aPath[index] == '/') {
+ aPath.setChar('\\', index);
}
}
}
Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp 2008-04-02 21:19:17 UTC (rev 31364)
@@ -45,9 +45,6 @@
*/
#if defined(__amigaos4__)
#include "backends/fs/amigaos4/amigaos4-fs-factory.h"
-#elif defined(__SYMBIAN32__)
- // TODO: Move this to the symbian source code
- #include "backends/fs/symbian/symbian-fs-factory.h"
#elif defined(UNIX)
#include "backends/fs/posix/posix-fs-factory.h"
#elif defined(WIN32)
@@ -235,13 +232,13 @@
FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
#if defined(__amigaos4__)
- return &AmigaOSFilesystemFactory::instance();
- #elif defined(__SYMBIAN32__)
- return &SymbianFilesystemFactory::instance();
+ return &AmigaOSFilesystemFactory::instance();
#elif defined(UNIX)
return &POSIXFilesystemFactory::instance();
#elif defined(WIN32)
return &WindowsFilesystemFactory::instance();
+ #elif defined(__SYMBIAN32__)
+ // Do nothing since its handled by the Symbian SDL inheritance
#else
#error Unknown and unsupported backend in OSystem_SDL::getFilesystemFactory
#endif
Modified: scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl
===================================================================
--- scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/symbian/AdaptAllMMPs.pl 2008-04-02 21:19:17 UTC (rev 31364)
@@ -73,7 +73,8 @@
my @excludes_scumm = (
"codec47ARM.cpp",
- "gfxARM.cpp"
+ "gfxARM.cpp",
+ "proc3arm.cpp"
);
#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])
Modified: scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in 2008-04-02 21:19:17 UTC (rev 31364)
@@ -115,7 +115,7 @@
SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\abstract-fs-factory.cpp
+SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
Modified: scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
===================================================================
--- scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in 2008-04-02 21:19:17 UTC (rev 31364)
@@ -116,7 +116,7 @@
SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.cpp
-SOURCE backends\fs\abstract-fs-factory.cpp
+SOURCE backends\fs\symbian\symbian-fs-factory.cpp
SOURCE backends\platform\symbian\src\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.cpp 2008-04-02 21:19:17 UTC (rev 31364)
@@ -24,7 +24,8 @@
#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError()
#include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath()
-
+
+#include "backends/fs/symbian/symbian-fs-factory.h"
#include "backends/platform/symbian/src/SymbianOS.h"
#include "backends/platform/symbian/src/SymbianActions.h"
#include "common/config-manager.h"
@@ -105,6 +106,10 @@
}
}
+FilesystemFactory *OSystem_SDL_Symbian::getFilesystemFactory() {
+ return &SymbianFilesystemFactory::instance();
+}
+
OSystem_SDL_Symbian::zoneDesc OSystem_SDL_Symbian::_zones[TOTAL_ZONES] = {
{ 0, 0, 320, 145 },
{ 0, 145, 150, 55 },
Modified: scummvm/trunk/backends/platform/symbian/src/SymbianOS.h
===================================================================
--- scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2008-04-02 10:48:23 UTC (rev 31363)
+++ scummvm/trunk/backends/platform/symbian/src/SymbianOS.h 2008-04-02 21:19:17 UTC (rev 31364)
@@ -75,6 +75,7 @@
//
void symbianMix(byte *samples, int len);
+ virtual FilesystemFactory *getFilesystemFactory();
public:
// vibration support
#ifdef USE_VIBRA_SE_PXXX
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