From 6842227ac2796edb6d82cbf0095c806fa6e738f6 Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Mon, 6 Jun 2011 12:26:01 +0200 Subject: COMMON: Add kInfo LogMessageType. --- common/system.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 1f2f8cc6d5..34fc076492 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -79,7 +79,7 @@ void OSystem::fatalError() { void OSystem::logMessage(LogMessageType::Type type, const char *message) { FILE *output = 0; - if (type == LogMessageType::kDebug) + if (type == LogMessageType::kInfo || type == LogMessageType::kDebug) output = stdout; else output = stderr; -- cgit v1.2.3 From afb06b51cceb96cf3ac2baae1f562c673114d108 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:02:33 +0200 Subject: BACKENDS: Unify AudioCD manager instantiation --- common/system.cpp | 14 ++++++++++++++ 1 file changed, 14 insertions(+) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 34fc076492..dcdc38c0db 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -26,6 +26,9 @@ #include "common/system.h" #include "common/str.h" +#include "common/textconsole.h" + +#include "backends/audiocd/default/default-audiocd.h" #ifdef __PLAYSTATION2__ // for those replaced fopen/fread/etc functions @@ -45,9 +48,20 @@ OSystem *g_system = 0; OSystem::OSystem() { + _audiocdManager = 0; } OSystem::~OSystem() { + delete _audiocdManager; +} + +void OSystem::initBackend() { +#ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER + if (!_audiocdManager) + _audiocdManager = new DefaultAudioCDManager(); +#endif + if (!_audiocdManager) + error("Backend failed to instantiate AudioCD manager"); } bool OSystem::setGraphicsMode(const char *name) { -- cgit v1.2.3 From c8475224221ed14590ad08929a1cadd6e8e3cc4e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:30:21 +0200 Subject: BACKENDS: Add OSystem::getDefaultConfigFileName This is used to provide default implementations for createConfigWriteStream and createConfigReadStream, which can be used by most backends. Note that backends can still override createConfigRead/WriteStream; this could be useful if settings on some port are not stored in a regular file (think 'Windows registry', for a hypothetical example). --- common/system.cpp | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index dcdc38c0db..307079d112 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -26,6 +26,7 @@ #include "common/system.h" #include "common/str.h" +#include "common/fs.h" #include "common/textconsole.h" #include "backends/audiocd/default/default-audiocd.h" @@ -90,6 +91,24 @@ void OSystem::fatalError() { exit(1); } +Common::SeekableReadStream *OSystem::createConfigReadStream() { + Common::FSNode file(getDefaultConfigFileName()); + return file.createReadStream(); +} + +Common::WriteStream *OSystem::createConfigWriteStream() { +#ifdef __DC__ + return 0; +#else + Common::FSNode file(getDefaultConfigFileName()); + return file.createWriteStream(); +#endif +} + +Common::String OSystem::getDefaultConfigFileName() { + return "scummvm.ini"; +} + void OSystem::logMessage(LogMessageType::Type type, const char *message) { FILE *output = 0; -- cgit v1.2.3 From 0e20bc0086f9e65454334c7a8f647d796188c0cf Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:39:05 +0200 Subject: COMMON: Remove PS2 / NDS hacks in system.cpp --- common/system.cpp | 24 ++++++------------------ 1 file changed, 6 insertions(+), 18 deletions(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 307079d112..298f1d7d0d 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -20,9 +20,10 @@ * */ -// Disable symbol overrides so that we can use system headers. -// FIXME: Necessary for the PS2 port, should get rid of this eventually. -#define FORBIDDEN_SYMBOL_ALLOW_ALL +#define FORBIDDEN_SYMBOL_EXCEPTION_exit +#define FORBIDDEN_SYMBOL_EXCEPTION_FILE +#define FORBIDDEN_SYMBOL_EXCEPTION_fputs +#define FORBIDDEN_SYMBOL_EXCEPTION_fflush #include "common/system.h" #include "common/str.h" @@ -31,21 +32,6 @@ #include "backends/audiocd/default/default-audiocd.h" -#ifdef __PLAYSTATION2__ - // for those replaced fopen/fread/etc functions - #include "backends/platform/ps2/fileio.h" - - #define fputs(str, file) ps2_fputs(str, file) - #define fflush(a) ps2_fflush(a) -#endif - -#ifdef __DS__ - #include "backends/fs/ds/ds-fs.h" - - #define fputs(str, file) DS::std_fwrite(str, strlen(str), 1, file) - #define fflush(file) DS::std_fflush(file) -#endif - OSystem *g_system = 0; OSystem::OSystem() { @@ -110,6 +96,7 @@ Common::String OSystem::getDefaultConfigFileName() { } void OSystem::logMessage(LogMessageType::Type type, const char *message) { +#if !defined(__PLAYSTATION2__) && !defined(__DS__) FILE *output = 0; if (type == LogMessageType::kInfo || type == LogMessageType::kDebug) @@ -119,6 +106,7 @@ void OSystem::logMessage(LogMessageType::Type type, const char *message) { fputs(message, output); fflush(output); +#endif } Common::String OSystem::getSystemLanguage() const { -- cgit v1.2.3 From c81e94b25214d258e0789f51b0ad0236ba1bf9c0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 15:51:46 +0200 Subject: BACKENDS: Unify EventManager setup --- common/system.cpp | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 298f1d7d0d..2a0dfd8dfd 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -26,8 +26,9 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_fflush #include "common/system.h" -#include "common/str.h" +#include "common/events.h" #include "common/fs.h" +#include "common/str.h" #include "common/textconsole.h" #include "backends/audiocd/default/default-audiocd.h" @@ -36,19 +37,29 @@ OSystem *g_system = 0; OSystem::OSystem() { _audiocdManager = 0; + _eventManager = 0; } OSystem::~OSystem() { delete _audiocdManager; + _audiocdManager = 0; + + delete _eventManager; + _eventManager = 0; } void OSystem::initBackend() { + // Init AudioCD manager #ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER if (!_audiocdManager) _audiocdManager = new DefaultAudioCDManager(); #endif if (!_audiocdManager) error("Backend failed to instantiate AudioCD manager"); + + // Verify Event manager has been set + if (!_eventManager) + error("Backend failed to instantiate Event manager"); } bool OSystem::setGraphicsMode(const char *name) { -- cgit v1.2.3 From 0a2fb9a465fe371daabf2a475fc20c5a870887c6 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 17:05:35 +0200 Subject: COMMON: Make more symbols forbidden --- common/system.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 2a0dfd8dfd..cd6ee46335 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -24,6 +24,8 @@ #define FORBIDDEN_SYMBOL_EXCEPTION_FILE #define FORBIDDEN_SYMBOL_EXCEPTION_fputs #define FORBIDDEN_SYMBOL_EXCEPTION_fflush +#define FORBIDDEN_SYMBOL_EXCEPTION_stdout +#define FORBIDDEN_SYMBOL_EXCEPTION_stderr #include "common/system.h" #include "common/events.h" -- cgit v1.2.3 From 04afdf7c7d2c70e4c31b65741d22545a8979367e Mon Sep 17 00:00:00 2001 From: Max Horn Date: Mon, 6 Jun 2011 23:25:37 +0200 Subject: BACKENDS: Move more 'manager slots' from ModularBackend to OSystem --- common/system.cpp | 43 ++++++++++++++++++++++++++++++++++++++----- 1 file changed, 38 insertions(+), 5 deletions(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index cd6ee46335..e34aeb54d6 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -34,12 +34,16 @@ #include "common/textconsole.h" #include "backends/audiocd/default/default-audiocd.h" +#include "backends/timer/default/default-timer.h" OSystem *g_system = 0; OSystem::OSystem() { _audiocdManager = 0; _eventManager = 0; + _timerManager = 0; + _savefileManager = 0; + _fsFactory = 0; } OSystem::~OSystem() { @@ -48,20 +52,35 @@ OSystem::~OSystem() { delete _eventManager; _eventManager = 0; + + delete _timerManager; + _timerManager = 0; + + delete _savefileManager; + _savefileManager = 0; + + delete _fsFactory; + _fsFactory = 0; } void OSystem::initBackend() { - // Init AudioCD manager + // Init audio CD manager #ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER if (!_audiocdManager) _audiocdManager = new DefaultAudioCDManager(); #endif - if (!_audiocdManager) - error("Backend failed to instantiate AudioCD manager"); - // Verify Event manager has been set + // Verify all managers has been set + if (!_audiocdManager) + error("Backend failed to instantiate audio CD manager"); if (!_eventManager) - error("Backend failed to instantiate Event manager"); + error("Backend failed to instantiate event manager"); + if (!_timerManager) + error("Backend failed to instantiate timer manager"); +// if (!_savefileManager) +// error("Backend failed to instantiate savefile manager"); +// if (!_fsFactory) +// error("Backend failed to instantiate fs factory"); } bool OSystem::setGraphicsMode(const char *name) { @@ -90,6 +109,20 @@ void OSystem::fatalError() { exit(1); } +Common::TimerManager *OSystem::getTimerManager() { + return _timerManager; +} + +Common::SaveFileManager *OSystem::getSavefileManager() { + assert(_savefileManager); + return _savefileManager; +} + +FilesystemFactory *OSystem::getFilesystemFactory() { + assert(_fsFactory); + return _fsFactory; +} + Common::SeekableReadStream *OSystem::createConfigReadStream() { Common::FSNode file(getDefaultConfigFileName()); return file.createReadStream(); -- cgit v1.2.3 From f13e6717598efe32b15dab79389c6f21b9e2294a Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 7 Jun 2011 11:58:40 +0200 Subject: BACKENDS: All backends use _timerManager now, adapt OSystem accordingly --- common/system.cpp | 4 ---- 1 file changed, 4 deletions(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index e34aeb54d6..6be7775b05 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -109,10 +109,6 @@ void OSystem::fatalError() { exit(1); } -Common::TimerManager *OSystem::getTimerManager() { - return _timerManager; -} - Common::SaveFileManager *OSystem::getSavefileManager() { assert(_savefileManager); return _savefileManager; -- cgit v1.2.3 From 997f0a190083d9fcca743c95e8aca03e261b0f1c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 7 Jun 2011 13:06:21 +0200 Subject: BACKENDS: All backends use _savefileManager now, adapt OSystem accordingly --- common/system.cpp | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 6be7775b05..27baea59f9 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -77,8 +77,16 @@ void OSystem::initBackend() { error("Backend failed to instantiate event manager"); if (!_timerManager) error("Backend failed to instantiate timer manager"); + + // TODO: We currently don't check _savefileManager, because at least + // on the Nintendo DS, it is possible that none is set. That should + // probably be treated as "saving is not possible". Or else the NDS + // port needs to be changed to always set a _savefileManager // if (!_savefileManager) // error("Backend failed to instantiate savefile manager"); + + // TODO: We currently don't check _fsFactory because not all ports + // set it. // if (!_fsFactory) // error("Backend failed to instantiate fs factory"); } @@ -109,11 +117,6 @@ void OSystem::fatalError() { exit(1); } -Common::SaveFileManager *OSystem::getSavefileManager() { - assert(_savefileManager); - return _savefileManager; -} - FilesystemFactory *OSystem::getFilesystemFactory() { assert(_fsFactory); return _fsFactory; -- cgit v1.2.3 From bdd5256e1536b8a954e9000161fcdbd730a35bbe Mon Sep 17 00:00:00 2001 From: Alyssa Milburn Date: Wed, 8 Jun 2011 11:44:08 +0200 Subject: COMMON: Add headers needed for delete calls. --- common/system.cpp | 2 ++ 1 file changed, 2 insertions(+) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 27baea59f9..286ec419f2 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -30,10 +30,12 @@ #include "common/system.h" #include "common/events.h" #include "common/fs.h" +#include "common/savefile.h" #include "common/str.h" #include "common/textconsole.h" #include "backends/audiocd/default/default-audiocd.h" +#include "backends/fs/fs-factory.h" #include "backends/timer/default/default-timer.h" OSystem *g_system = 0; -- cgit v1.2.3 From fce7f90a94165158ea93d5969d795ad5a565847c Mon Sep 17 00:00:00 2001 From: Max Horn Date: Wed, 8 Jun 2011 14:29:22 +0200 Subject: BACKENDS: Shuffle backends class hierarchy and module initialization --- common/system.cpp | 6 ------ 1 file changed, 6 deletions(-) (limited to 'common/system.cpp') diff --git a/common/system.cpp b/common/system.cpp index 286ec419f2..fae7a3ef34 100644 --- a/common/system.cpp +++ b/common/system.cpp @@ -66,12 +66,6 @@ OSystem::~OSystem() { } void OSystem::initBackend() { - // Init audio CD manager -#ifndef DISABLE_DEFAULT_AUDIOCD_MANAGER - if (!_audiocdManager) - _audiocdManager = new DefaultAudioCDManager(); -#endif - // Verify all managers has been set if (!_audiocdManager) error("Backend failed to instantiate audio CD manager"); -- cgit v1.2.3