[Scummvm-cvs-logs] SF.net SVN: scummvm:[45831] scummvm/trunk/backends/platform

[aquadran at users.sourceforge.net]

Revision: 45831
          http://scummvm.svn.sourceforge.net/scummvm/?rev=45831&view=rev
Author:   aquadran
Date:     2009-11-11 14:21:58 +0000 (Wed, 11 Nov 2009)

Log Message:
-----------
samsungtv: move DEFAULT_CONFIG_FILE into main sdl code to prevent code duplication

Modified Paths:
--------------
    scummvm/trunk/backends/platform/samsungtv/sdl.cpp
    scummvm/trunk/backends/platform/samsungtv/sdl.h
    scummvm/trunk/backends/platform/sdl/sdl.cpp

Modified: scummvm/trunk/backends/platform/samsungtv/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-11 14:10:17 UTC (rev 45830)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.cpp	2009-11-11 14:21:58 UTC (rev 45831)
@@ -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 @@
 	}
 }
 
-
-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) ||

Modified: scummvm/trunk/backends/platform/samsungtv/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-11 14:10:17 UTC (rev 45830)
+++ scummvm/trunk/backends/platform/samsungtv/sdl.h	2009-11-11 14:21:58 UTC (rev 45831)
@@ -74,9 +74,6 @@
 
 	virtual void addSysArchivesToSearchSet(Common::SearchSet &s, int priority = 0);
 
-	virtual Common::SeekableReadStream *createConfigReadStream();
-	virtual Common::WriteStream *createConfigWriteStream();
-
 protected:
 
 	SDL_Surface *_prehwscreen;

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2009-11-11 14:10:17 UTC (rev 45830)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2009-11-11 14:21:58 UTC (rev 45831)
@@ -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


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.