From 91b889e2d36baf8a8e1f56f05f4d063e5ae79849 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Fri, 3 Jun 2011 23:30:55 +0200 Subject: COMMON: Rename kFeatureCursorHasPalette -> kFeatureCursorPalette --- backends/platform/psp/osys_psp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 3db743eff3..2b37460241 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -110,7 +110,7 @@ void OSystem_PSP::engineDone() { } bool OSystem_PSP::hasFeature(Feature f) { - return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorHasPalette); + return (f == kFeatureOverlaySupportsAlpha || f == kFeatureCursorPalette); } void OSystem_PSP::setFeatureState(Feature f, bool enable) { -- cgit v1.2.3 From ce32745d9c26a0b97dce6a137a46ff2004c7be02 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Sat, 4 Jun 2011 00:14:09 +0200 Subject: BACKENDS: Replace OSystem::disableCursorPalette by setFeatureState calls --- backends/platform/psp/osys_psp.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 2b37460241..eb629376d2 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -114,9 +114,16 @@ bool OSystem_PSP::hasFeature(Feature f) { } void OSystem_PSP::setFeatureState(Feature f, bool enable) { + if (f == kFeatureCursorPalette) { + _pendingUpdate = false; + _cursor.enableCursorPalette(enable); + } } bool OSystem_PSP::getFeatureState(Feature f) { + if (f == kFeatureCursorPalette) { + return _cursor.isCursorPaletteEnabled(); + } return false; } @@ -198,12 +205,6 @@ void OSystem_PSP::setCursorPalette(const byte *colors, uint start, uint num) { _cursor.clearKeyColor(); // Do we need this? } -void OSystem_PSP::disableCursorPalette(bool disable) { - DEBUG_ENTER_FUNC(); - _pendingUpdate = false; - _cursor.enableCursorPalette(!disable); -} - void OSystem_PSP::copyRectToScreen(const byte *buf, int pitch, int x, int y, int w, int h) { DEBUG_ENTER_FUNC(); _displayManager.waitUntilRenderFinished(); -- 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 --- backends/platform/psp/osys_psp.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index eb629376d2..16688698e2 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -100,7 +100,7 @@ void OSystem_PSP::initBackend() { setupMixer(); - OSystem::initBackend(); + BaseBackend::initBackend(); } // Let's us know an engine -- 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). --- backends/platform/psp/osys_psp.cpp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 16688698e2..4408cbf481 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -439,14 +439,6 @@ void OSystem_PSP::getTimeAndDate(TimeDate &td) const { td.tm_year = t.tm_year; } -#define PSP_CONFIG_FILE "ms0:/scummvm.ini" - -Common::SeekableReadStream *OSystem_PSP::createConfigReadStream() { - Common::FSNode file(PSP_CONFIG_FILE); - return file.createReadStream(); -} - -Common::WriteStream *OSystem_PSP::createConfigWriteStream() { - Common::FSNode file(PSP_CONFIG_FILE); - return file.createWriteStream(); +Common::String OSystem_PSP::getDefaultConfigFileName() { + return "ms0:/scummvm.ini"; } -- cgit v1.2.3 From 0b859e026d4f2b4631afa76779976fae1f0c6878 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Tue, 7 Jun 2011 10:58:20 +0200 Subject: PSP: Use OSystem's 'slots' for timer/savefile manager --- backends/platform/psp/osys_psp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 4408cbf481..12916f8725 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -89,9 +89,9 @@ void OSystem_PSP::initBackend() { _imageViewer.setInputHandler(&_inputHandler); _imageViewer.setDisplayManager(&_displayManager); - _savefile = new PSPSaveFileManager; + _savefileManager = new PSPSaveFileManager; - _timer = new DefaultTimerManager(); + _timerManager = new DefaultTimerManager(); PSP_DEBUG_PRINT("calling keyboard.load()\n"); _keyboard.load(); // Load virtual keyboard files into memory -- 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 --- backends/platform/psp/osys_psp.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'backends/platform/psp/osys_psp.cpp') diff --git a/backends/platform/psp/osys_psp.cpp b/backends/platform/psp/osys_psp.cpp index 12916f8725..01124b420e 100644 --- a/backends/platform/psp/osys_psp.cpp +++ b/backends/platform/psp/osys_psp.cpp @@ -100,7 +100,7 @@ void OSystem_PSP::initBackend() { setupMixer(); - BaseBackend::initBackend(); + EventsBaseBackend::initBackend(); } // Let's us know an engine @@ -422,7 +422,7 @@ void OSystem_PSP::quit() { } void OSystem_PSP::logMessage(LogMessageType::Type type, const char *message) { - BaseBackend::logMessage(type, message); + EventsBaseBackend::logMessage(type, message); if (type == LogMessageType::kError) PspDebugTrace(false, "%s", message); // write to file -- cgit v1.2.3