aboutsummaryrefslogtreecommitdiff
path: root/backends/platform
diff options
context:
space:
mode:
authorPaweł Kołodziejski2009-11-11 14:21:58 +0000
committerPaweł Kołodziejski2009-11-11 14:21:58 +0000
commita3363e6e1ffccc1d9ae9908466e37e43b2f579ee (patch)
treef71eb75226b1d4d6046ead11c4568e9ac02397c1 /backends/platform
parent6bc410ba347e5578089713be9866580bb815323d (diff)
downloadscummvm-rg350-a3363e6e1ffccc1d9ae9908466e37e43b2f579ee.tar.gz
scummvm-rg350-a3363e6e1ffccc1d9ae9908466e37e43b2f579ee.tar.bz2
scummvm-rg350-a3363e6e1ffccc1d9ae9908466e37e43b2f579ee.zip
samsungtv: move DEFAULT_CONFIG_FILE into main sdl code to prevent code duplication
svn-id: r45831
Diffstat (limited to 'backends/platform')
-rw-r--r--backends/platform/samsungtv/sdl.cpp19
-rw-r--r--backends/platform/samsungtv/sdl.h3
-rw-r--r--backends/platform/sdl/sdl.cpp2
3 files changed, 2 insertions, 22 deletions
diff --git a/backends/platform/samsungtv/sdl.cpp b/backends/platform/samsungtv/sdl.cpp
index 0f3095092c..099b9c9928 100644
--- a/backends/platform/samsungtv/sdl.cpp
+++ b/backends/platform/samsungtv/sdl.cpp
@@ -43,8 +43,6 @@
#if defined(SAMSUNGTV)
-#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
-
static Uint32 timer_handler(Uint32 interval, void *param) {
((DefaultTimerManager *)param)->handler();
return interval;
@@ -145,23 +143,6 @@ void OSystem_SDL_SamsungTV::addSysArchivesToSearchSet(Common::SearchSet &s, int
}
}
-
-static Common::String getDefaultConfigFileName() {
- char configFile[MAXPATHLEN];
- strcpy(configFile, DEFAULT_CONFIG_FILE);
- return configFile;
-}
-
-Common::SeekableReadStream *OSystem_SDL_SamsungTV::createConfigReadStream() {
- Common::FSNode file(getDefaultConfigFileName());
- return file.createReadStream();
-}
-
-Common::WriteStream *OSystem_SDL_SamsungTV::createConfigWriteStream() {
- Common::FSNode file(getDefaultConfigFileName());
- return file.createWriteStream();
-}
-
bool OSystem_SDL_SamsungTV::hasFeature(Feature f) {
return
(f == kFeatureAutoComputeDirtyRects) ||
diff --git a/backends/platform/samsungtv/sdl.h b/backends/platform/samsungtv/sdl.h
index 2d0f00c3d5..5879a775c5 100644
--- a/backends/platform/samsungtv/sdl.h
+++ b/backends/platform/samsungtv/sdl.h
@@ -74,9 +74,6 @@ public:
virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
- virtual Common::SeekableReadStream *createConfigReadStream();
- virtual Common::WriteStream *createConfigWriteStream();
-
protected:
SDL_Surface *_prehwscreen;
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index e3e8947daa..368522b9d5 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -68,6 +68,8 @@
#if defined(UNIX)
#ifdef MACOSX
#define DEFAULT_CONFIG_FILE "Library/Preferences/ScummVM Preferences"
+#elif defined(SAMSUNGTV)
+#define DEFAULT_CONFIG_FILE "/dtv/usb/sda1/.scummvmrc"
#else
#define DEFAULT_CONFIG_FILE ".scummvmrc"
#endif