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

fingolfin at users.sourceforge.net fingolfin at users.sourceforge.net
Sun Nov 28 16:44:35 CET 2010


Revision: 54526
          http://scummvm.svn.sourceforge.net/scummvm/?rev=54526&view=rev
Author:   fingolfin
Date:     2010-11-28 15:44:34 +0000 (Sun, 28 Nov 2010)

Log Message:
-----------
SDL: Merge deinit() into OSystem_SDL destructor and overload fatalError

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

Modified: scummvm/trunk/backends/platform/dingux/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/dingux/main.cpp	2010-11-28 15:44:03 UTC (rev 54525)
+++ scummvm/trunk/backends/platform/dingux/main.cpp	2010-11-28 15:44:34 UTC (rev 54526)
@@ -46,8 +46,10 @@
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-	((OSystem_SDL_Dingux *)g_system)->deinit();
 
+	// Free OSystem
+	delete (OSystem_SDL_Dingux *)g_system;
+
 	return res;
 }
 

Modified: scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp	2010-11-28 15:44:03 UTC (rev 54525)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.cpp	2010-11-28 15:44:34 UTC (rev 54526)
@@ -67,14 +67,4 @@
 	}
 }
 
-void OSystem_SDL_SamsungTV::fatalError() {
-	// FIXME
-	for (;;) {}
-}
-
-void OSystem_SDL_SamsungTV::quit() {
-	// FIXME
-	deinit();
-}
-
 #endif

Modified: scummvm/trunk/backends/platform/samsungtv/samsungtv.h
===================================================================
--- scummvm/trunk/backends/platform/samsungtv/samsungtv.h	2010-11-28 15:44:03 UTC (rev 54525)
+++ scummvm/trunk/backends/platform/samsungtv/samsungtv.h	2010-11-28 15:44:34 UTC (rev 54526)
@@ -37,9 +37,6 @@
 	virtual bool hasFeature(Feature f);
 	virtual void setFeatureState(Feature f, bool enable);
 	virtual bool getFeatureState(Feature f);
-
-	virtual void fatalError();
-	virtual void quit();
 };
 
 #endif

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-11-28 15:44:03 UTC (rev 54525)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-11-28 15:44:34 UTC (rev 54526)
@@ -79,7 +79,33 @@
 }
 
 OSystem_SDL::~OSystem_SDL() {
-	deinit();
+	SDL_ShowCursor(SDL_ENABLE);
+
+	delete _savefileManager;
+	_savefileManager = 0;
+	delete _graphicsManager;
+	_graphicsManager = 0;
+	delete _eventManager;
+	_eventManager = 0;
+	delete _eventSource;
+	_eventSource = 0;
+	delete _audiocdManager;
+	_audiocdManager = 0;
+	delete _mixerManager;
+	_mixerManager = 0;
+	delete _timerManager;
+	_timerManager = 0;
+	delete _mutexManager;
+	_mutexManager = 0;
+
+#ifdef USE_OPENGL
+	delete[] _graphicsModes;
+#endif
+
+	delete _logger;
+	_logger = 0;
+
+	SDL_Quit();
 }
 
 void OSystem_SDL::init() {
@@ -200,36 +226,6 @@
 	}
 }
 
-void OSystem_SDL::deinit() {
-	SDL_ShowCursor(SDL_ENABLE);
-
-	delete _savefileManager;
-	_savefileManager = 0;
-	delete _graphicsManager;
-	_graphicsManager = 0;
-	delete _eventManager;
-	_eventManager = 0;
-	delete _eventSource;
-	_eventSource = 0;
-	delete _audiocdManager;
-	_audiocdManager = 0;
-	delete _mixerManager;
-	_mixerManager = 0;
-	delete _timerManager;
-	_timerManager = 0;
-	delete _mutexManager;
-	_mutexManager = 0;
-
-#ifdef USE_OPENGL
-	delete[] _graphicsModes;
-#endif
-
-	delete _logger;
-	_logger = 0;
-
-	SDL_Quit();
-}
-
 void OSystem_SDL::addSysArchivesToSearchSet(Common::SearchSet &s, int priority) {
 
 #ifdef DATA_PATH
@@ -364,10 +360,16 @@
 }
 
 void OSystem_SDL::quit() {
-	deinit();
+	delete this;
 	exit(0);
 }
 
+void OSystem_SDL::fatalError() {
+	delete this;
+	exit(1);
+}
+
+
 void OSystem_SDL::logMessage(LogMessageType::Type type, const char *message) {
 	ModularBackend::logMessage(type, message);
 	if (_logger)

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2010-11-28 15:44:03 UTC (rev 54525)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2010-11-28 15:44:34 UTC (rev 54526)
@@ -63,7 +63,7 @@
 	virtual void initBackend();
 	virtual Common::HardwareKeySet *getHardwareKeySet();
 	virtual void quit();
-	virtual void deinit();
+	virtual void fatalError();
 
 	// Logging
 	virtual void logMessage(LogMessageType::Type type, const char *message);


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




More information about the Scummvm-git-logs mailing list