thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove Symbian FS creation from common SDL code

Browse source 
svn-id: r31364
This commit is contained in:
Lars Persson 2008-04-02 21:19:17 +00:00
parent 9bda498099
commit acc5d79d7c
7 changed files with 18 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

8
backends/fs/symbian/symbian-fs.cpp
View file

@ -106,12 +106,12 @@ const char *lastPathComponent(const Common::String &str) {
* *
* @param path String with the path to be fixed. * @param path String with the path to be fixed.
*/ */
static void fixFilePath(Common::String& path) { static void fixFilePath(Common::String& aPath){
TInt len = path.size(); TInt len = aPath.size();
for (TInt index = 0; index < len; index++) { for (TInt index = 0; index < len; index++) {
if (path[index] == '/') { if (aPath[index] == '/') {
path[index] = '\\'; aPath.setChar('\\', index);
} }
} }
} }

9
backends/platform/sdl/sdl.cpp
View file

@ -45,9 +45,6 @@
*/ */
#if defined(__amigaos4__) #if defined(__amigaos4__)
#include "backends/fs/amigaos4/amigaos4-fs-factory.h" #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) #elif defined(UNIX)
#include "backends/fs/posix/posix-fs-factory.h" #include "backends/fs/posix/posix-fs-factory.h"
#elif defined(WIN32) #elif defined(WIN32)
@ -235,13 +232,13 @@ Common::SaveFileManager *OSystem_SDL::getSavefileManager() {
FilesystemFactory *OSystem_SDL::getFilesystemFactory() { FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
#if defined(__amigaos4__) #if defined(__amigaos4__)
return &AmigaOSFilesystemFactory::instance(); return &AmigaOSFilesystemFactory::instance();
#elif defined(__SYMBIAN32__)
return &SymbianFilesystemFactory::instance();
#elif defined(UNIX) #elif defined(UNIX)
return &POSIXFilesystemFactory::instance(); return &POSIXFilesystemFactory::instance();
#elif defined(WIN32) #elif defined(WIN32)
return &WindowsFilesystemFactory::instance(); return &WindowsFilesystemFactory::instance();
#elif defined(__SYMBIAN32__)
// Do nothing since its handled by the Symbian SDL inheritance
#else #else
#error Unknown and unsupported backend in OSystem_SDL::getFilesystemFactory #error Unknown and unsupported backend in OSystem_SDL::getFilesystemFactory
#endif #endif

3
backends/platform/symbian/AdaptAllMMPs.pl
View file

@ -73,7 +73,8 @@ my @excludes_graphics = (
my @excludes_scumm = ( my @excludes_scumm = (
"codec47ARM.cpp", "codec47ARM.cpp",
"gfxARM.cpp" "gfxARM.cpp",
"proc3arm.cpp"
); );
#arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray]) #arseModule(mmpStr, dirStr, ifdefArray, [exclusionsArray])

2
backends/platform/symbian/S60v3/ScummVM_S60v3.mmp.in
View file

@ -115,7 +115,7 @@ SOURCEPATH ..\..\..\..
SOURCE backends\platform\sdl\events.cpp SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.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\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp SOURCE backends\platform\symbian\src\ScummApp.cpp

2
backends/platform/symbian/UIQ3/ScummVM_UIQ3.mmp.in
View file

@ -116,7 +116,7 @@ SOURCEPATH ..\..\..\..\
SOURCE backends\platform\sdl\events.cpp SOURCE backends\platform\sdl\events.cpp
SOURCE backends\platform\sdl\graphics.cpp SOURCE backends\platform\sdl\graphics.cpp
SOURCE backends\platform\sdl\sdl.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\SymbianOS.cpp
SOURCE backends\platform\symbian\src\SymbianActions.cpp SOURCE backends\platform\symbian\src\SymbianActions.cpp
SOURCE backends\platform\symbian\src\ScummApp.cpp SOURCE backends\platform\symbian\src\ScummApp.cpp

7
backends/platform/symbian/src/SymbianOS.cpp
View file

@ -24,7 +24,8 @@
#include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError() #include <eikenv.h> // for CEikonEnv::Static() @ Symbian::FatalError()
#include <sdlapp.h> // for CSDLApp::GetExecutablePathCStr() @ Symbian::GetExecutablePath() #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/SymbianOS.h"
#include "backends/platform/symbian/src/SymbianActions.h" #include "backends/platform/symbian/src/SymbianActions.h"
#include "common/config-manager.h" #include "common/config-manager.h"
@ -105,6 +106,10 @@ void OSystem_SDL_Symbian::setFeatureState(Feature f, bool enable) {
} }
} }
FilesystemFactory *OSystem_SDL_Symbian::getFilesystemFactory() {
return &SymbianFilesystemFactory::instance();
}
OSystem_SDL_Symbian::zoneDesc OSystem_SDL_Symbian::_zones[TOTAL_ZONES] = { OSystem_SDL_Symbian::zoneDesc OSystem_SDL_Symbian::_zones[TOTAL_ZONES] = {
{ 0, 0, 320, 145 }, { 0, 0, 320, 145 },
{ 0, 145, 150, 55 }, { 0, 145, 150, 55 },

1
backends/platform/symbian/src/SymbianOS.h
View file

@ -75,6 +75,7 @@ protected:
// //
void symbianMix(byte *samples, int len); void symbianMix(byte *samples, int len);
virtual FilesystemFactory *getFilesystemFactory();
public: public:
// vibration support // vibration support
#ifdef USE_VIBRA_SE_PXXX #ifdef USE_VIBRA_SE_PXXX