libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2025-04-03 23:31:57 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added new OSystem method addSysArchivesToSearchSet() [better name pending, suggestions welcome]

Browse Source 
svn-id: r34424
This commit is contained in:
Max Horn 2008-09-07 21:30:55 +00:00
parent f6c4df8281
commit 38a44f85ae
3 changed files with 49 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

36
backends/platform/sdl/sdl.cpp
View File

@ -32,6 +32,7 @@
#endif
#include "backends/platform/sdl/sdl.h"
#include "common/archive.h"
#include "common/config-manager.h"
#include "common/events.h"
#include "common/util.h"
@ -71,6 +72,9 @@
#define DEFAULT_CONFIG_FILE "scummvm.ini"
#endif
#if defined(MACOSX) || defined(IPHONE)
#include "CoreFoundation/CoreFoundation.h"
#endif
static Uint32 timer_handler(Uint32 interval, void *param) {
@ -271,6 +275,38 @@ FilesystemFactory *OSystem_SDL::getFilesystemFactory() {
return _fsFactory;
}
void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s) {
#ifdef DATA_PATH
// Add the global DATA_PATH to the directory search list
// FIXME: We use depth = 4 for now, to match the old code. May want to change that
Common::FilesystemNode dataNode(DATA_PATH);
if (dataNode.exists() && dataNode.isDirectory()) {
Common::ArchivePtr dataArchive(new Common::FSDirectory(dataNode, 4));
s.add(DATA_PATH, dataArchive);
}
#endif
#if defined(MACOSX) || defined(IPHONE)
// Get URL of the Resource directory of the .app bundle
CFURLRef fileUrl = CFBundleCopyResourcesDirectoryURL(CFBundleGetMainBundle());
if (fileUrl) {
// Try to convert the URL to an absolute path
UInt8 buf[MAXPATHLEN];
if (CFURLGetFileSystemRepresentation(fileUrl, true, buf, sizeof(buf))) {
// Success: Add it to the search path
Common::String bundlePath((const char *)buf);
Common::ArchivePtr bundleArchive(new Common::FSDirectory(bundlePath));
s.add("__OSX_BUNDLE__", bundleArchive);
}
CFRelease(fileUrl);
}
#endif
}
static Common::String getDefaultConfigFileName() {
char configFile[MAXPATHLEN];
#if defined (WIN32) && !defined(_WIN32_WCE) && !defined(__SYMBIAN32__)

1
backends/platform/sdl/sdl.h
View File

@ -209,6 +209,7 @@ public:
virtual Common::SaveFileManager *getSavefileManager();
virtual FilesystemFactory *getFilesystemFactory();
virtual void addSysArchivesToSearchSet(Common::SearchSet &s);
virtual Common::SeekableReadStream *openConfigFileForReading();
virtual Common::WriteStream *openConfigFileForWriting();

12
common/system.h
View File

@ -43,6 +43,7 @@ namespace Common {
struct Event;
class EventManager;
class SaveFileManager;
class SearchSet;
class TimerManager;
class SeekableReadStream;
class WriteStream;
@ -906,6 +907,17 @@ public:
*/
virtual FilesystemFactory *getFilesystemFactory() = 0;
/**
* Add system specific Common::Archive objects to the given SearchSet.
* E.g. on Unix the dir corresponding to DATA_PATH (if set), or on
* Mac OS X the 'Resource' dir in the app bundle.
*
* @todo Come up with a better name. This one sucks.
*
* @todo Allow specifying a priority with which the new dirs are added?
*/
virtual void addSysArchivesToSearchSet(Common::SearchSet &s) {}
/**
* Open the default config file for reading, by returning a suitable
* ReadStream instance. It is the callers responsiblity to delete