[Scummvm-cvs-logs] CVS: scummvm/backends/sdl graphics.cpp,1.8,1.9 sdl-common.h,1.57,1.58 sdl.cpp,1.68,1.69

[Max Horn]

Update of /cvsroot/scummvm/scummvm/backends/sdl
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv31345/backends/sdl

Modified Files:
	graphics.cpp sdl-common.h sdl.cpp 
Log Message:
Remove explicit OSystem parameter from StackLock constructor; added OSystem::displayMessageOnOSD (not yet used; default implementation provided)

Index: graphics.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/graphics.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- graphics.cpp	28 Mar 2004 16:30:47 -0000	1.8
+++ graphics.cpp	28 Mar 2004 20:31:17 -0000	1.9
@@ -50,7 +50,7 @@
 }
 
 bool OSystem_SDL::setGraphicsMode(int mode) {
-	Common::StackLock lock(_graphicsMutex, this);
+	Common::StackLock lock(_graphicsMutex);
 
 	int newScaleFactor = 1;
 	ScalerProc *newScalerProc;
@@ -327,7 +327,7 @@
 }
 
 void OSystem_SDL::updateScreen() {
-	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
 
 	internUpdateScreen();
 }
@@ -490,13 +490,13 @@
 bool OSystem_SDL::save_screenshot(const char *filename) {
 	assert(_hwscreen != NULL);
 
-	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
 	SDL_SaveBMP(_hwscreen, filename);
 	return true;
 }
 
 void OSystem_SDL::setFullscreenMode(bool enable) {
-	Common::StackLock lock(_graphicsMutex, this);
+	Common::StackLock lock(_graphicsMutex);
 
 	if (_full_screen != enable) {
 		assert(_hwscreen != 0);
@@ -536,7 +536,7 @@
 	if (_screen == NULL)
 		return;
 
-	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
 	
 	if (((long)src & 3) == 0 && pitch == _screenWidth && x==0 && y==0 &&
 			w==_screenWidth && h==_screenHeight && _mode_flags&DF_WANT_RECT_OPTIM) {
@@ -755,7 +755,7 @@
 	if ((dx == 0 && dy == 0) || height <= 0)
 		return;
 
-	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
 
 	byte *src, *dst;
 	int x, y;
@@ -849,7 +849,7 @@
 	if (!_overlayVisible)
 		return;
 	
-	Common::StackLock lock(_graphicsMutex, this);	// Lock the mutex until this function ends
+	Common::StackLock lock(_graphicsMutex);	// Lock the mutex until this function ends
 	
 	// hide the mouse
 	undraw_mouse();

Index: sdl-common.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl-common.h,v
retrieving revision 1.57
retrieving revision 1.58
diff -u -d -r1.57 -r1.58
--- sdl-common.h	28 Mar 2004 16:30:47 -0000	1.57
+++ sdl-common.h	28 Mar 2004 20:31:17 -0000	1.58
@@ -137,6 +137,10 @@
 	virtual void setFeatureState(Feature f, bool enable);
 	virtual bool getFeatureState(Feature f);
 
+#ifdef USE_OSD
+	void displayMessageOnOSD(const char *msg);
+#endif
+
 protected:
 	void init_intern();
 
@@ -150,8 +154,6 @@
 		kOSDColorKey = 1,
 		kOSDInitialAlpha = 80			// Initial alpha level, in percent
 	};
-	
-	void displayMessageOnOSD(const char *msg);
 #endif
 
 	// hardware screen
@@ -252,7 +254,7 @@
 	void toggleMouseGrab();
 
 
-	void internUpdateScreen();
+	virtual void internUpdateScreen();
 
 	void load_gfx_mode();
 	void unload_gfx_mode();

Index: sdl.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/sdl/sdl.cpp,v
retrieving revision 1.68
retrieving revision 1.69
diff -u -d -r1.68 -r1.69
--- sdl.cpp	15 Mar 2004 19:07:56 -0000	1.68
+++ sdl.cpp	28 Mar 2004 20:31:17 -0000	1.69
@@ -144,7 +144,7 @@
 		break;
 	case kFeatureAspectRatioCorrection:
 		if (_screenHeight == 200 && _adjustAspectRatio != enable) {
-			Common::StackLock lock(_graphicsMutex, this);
+			Common::StackLock lock(_graphicsMutex);
 
 			//assert(_hwscreen != 0);
 			_adjustAspectRatio ^= true;