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

[sev at users.sourceforge.net]

Revision: 49131
          http://scummvm.svn.sourceforge.net/scummvm/?rev=49131&view=rev
Author:   sev
Date:     2010-05-21 18:22:11 +0000 (Fri, 21 May 2010)

Log Message:
-----------
SDL: Split quit() method into deinit() so error codes could be returned.

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

Modified: scummvm/trunk/backends/platform/sdl/main.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/main.cpp	2010-05-21 18:18:52 UTC (rev 49130)
+++ scummvm/trunk/backends/platform/sdl/main.cpp	2010-05-21 18:22:11 UTC (rev 49131)
@@ -63,7 +63,7 @@
 
 	// Invoke the actual ScummVM main entry point:
 	int res = scummvm_main(argc, argv);
-	g_system->quit();	// TODO: Consider removing / replacing this!
+	((OSystem_SDL *)g_system)->deinit();
 	return res;
 }
 

Modified: scummvm/trunk/backends/platform/sdl/sdl.cpp
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-05-21 18:18:52 UTC (rev 49130)
+++ scummvm/trunk/backends/platform/sdl/sdl.cpp	2010-05-21 18:22:11 UTC (rev 49131)
@@ -496,7 +496,7 @@
 	}
 }
 
-void OSystem_SDL::quit() {
+void OSystem_SDL::deinit() {
 	if (_cdrom) {
 		SDL_CDStop(_cdrom);
 		SDL_CDClose(_cdrom);
@@ -525,7 +525,11 @@
 	// recorded events
 	delete getEventManager();
 	delete _savefile;
+}
 
+void OSystem_SDL::quit() {
+	deinit();
+
 #if !defined(SAMSUNGTV)
 	exit(0);
 #endif

Modified: scummvm/trunk/backends/platform/sdl/sdl.h
===================================================================
--- scummvm/trunk/backends/platform/sdl/sdl.h	2010-05-21 18:18:52 UTC (rev 49130)
+++ scummvm/trunk/backends/platform/sdl/sdl.h	2010-05-21 18:22:11 UTC (rev 49131)
@@ -202,6 +202,8 @@
 	// Quit
 	virtual void quit(); // overloaded by CE backend
 
+	void deinit();
+
 	virtual void getTimeAndDate(TimeDate &t) const;
 	virtual Common::TimerManager *getTimerManager();
 


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