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/sdl/sdl.cpp | 2 ++
 1 file changed, 2 insertions(+)

(limited to 'backends/platform/sdl/sdl.cpp')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index a3fb719ca4..527520a7ea 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -206,6 +206,8 @@ void OSystem_SDL::initBackend() {
 	setupIcon();
 
 	_inited = true;
+
+	ModularBackend::initBackend();
 }
 
 void OSystem_SDL::initSDL() {
-- 
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/sdl/sdl.cpp | 14 --------------
 1 file changed, 14 deletions(-)

(limited to 'backends/platform/sdl/sdl.cpp')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 527520a7ea..564dd83fd8 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -246,20 +246,6 @@ void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority)
 
 }
 
-Common::String OSystem_SDL::getDefaultConfigFileName() {
-	return "scummvm.ini";
-}
-
-Common::SeekableReadStream *OSystem_SDL::createConfigReadStream() {
-	Common::FSNode file(getDefaultConfigFileName());
-	return file.createReadStream();
-}
-
-Common::WriteStream *OSystem_SDL::createConfigWriteStream() {
-	Common::FSNode file(getDefaultConfigFileName());
-	return file.createWriteStream();
-}
-
 void OSystem_SDL::setWindowCaption(const char *caption) {
 	Common::String cap;
 	byte c;
-- 
cgit v1.2.3


From 18e8e5c91eba3ad7f3eb2b9786e170d53866e195 Mon Sep 17 00:00:00 2001
From: Max Horn
Date: Mon, 6 Jun 2011 17:18:50 +0200
Subject: SDL: Use #define FORBIDDEN_SYMBOL_ALLOW_ALL (backends can use any
 symbol)

---
 backends/platform/sdl/sdl.cpp | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'backends/platform/sdl/sdl.cpp')

diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 564dd83fd8..afc6c850d9 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -20,8 +20,7 @@
  *
  */
 
-#define FORBIDDEN_SYMBOL_EXCEPTION_time_h
-#define FORBIDDEN_SYMBOL_EXCEPTION_exit
+#define FORBIDDEN_SYMBOL_ALLOW_ALL
 
 #ifdef WIN32
 #define WIN32_LEAN_AND_MEAN
-- 
cgit v1.2.3