[Scummvm-cvs-logs] CVS: scummvm/backends/gp32 gp32.cpp,1.8,1.9 gp32.h,1.9,1.10 sdl.h,1.1,1.2

[Joost Peters]

Update of /cvsroot/scummvm/scummvm/backends/gp32
In directory sc8-pr-cvs1:/tmp/cvs-serv9005/backends/gp32

Modified Files:
	gp32.cpp gp32.h sdl.h 
Log Message:
update, fix compilation

Index: gp32.cpp
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.cpp,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- gp32.cpp	5 Jul 2003 15:17:45 -0000	1.8
+++ gp32.cpp	21 Jul 2003 01:11:20 -0000	1.9
@@ -766,8 +766,7 @@
 				
 				dst_y *= _scaleFactor;
 
-				_scaler_proc((byte*)sdl_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch, NULL, 
-					(byte*)sdl_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);			
+				_scaler_proc((byte*)sdl_tmpscreen->pixels + (r->x*2+2) + (r->y+1)*srcPitch, srcPitch, (byte*)sdl_hwscreen->pixels + r->x*2*_scaleFactor + dst_y*dstPitch, dstPitch, r->w, dst_h);			
 			}			
 			r->x *= _scaleFactor;
 			r->y = dst_y;
@@ -984,6 +983,11 @@
 	return false; 
 }
 
+void OSystem_GP32::clear_sound_proc() {
+	//_sound_proc = NULL;
+	//_sound_proc_param = NULL;
+}
+
 void OSystem_GP32::get_screen_image(byte *buf) {
 	/* make sure the mouse is gone */
 	undraw_mouse();
@@ -1075,7 +1079,9 @@
 void OSystem_GP32::set_timer(int timer, int (*callback)(int)) { }
 
 // Mutex handling
-MutexRef OSystem_GP32::create_mutex() { }
+OSystem::MutexRef OSystem_GP32::create_mutex() {
+	return NULL;
+}
 void OSystem_GP32::lock_mutex(MutexRef mutex) { }
 void OSystem_GP32::unlock_mutex(MutexRef mutex) { }
 void OSystem_GP32::delete_mutex(MutexRef mutex) { }

Index: gp32.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/gp32.h,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- gp32.h	5 Jul 2003 15:17:45 -0000	1.9
+++ gp32.h	21 Jul 2003 01:11:20 -0000	1.10
@@ -39,7 +39,9 @@
 	// Set the size of the video bitmap.
 	// Typically, 320x200
 	void init_size(uint w, uint h);
-
+	int16 get_height() { return _screenHeight; }
+	int16 get_width() { return _screenWidth; }
+	
 	// Draw a bitmap to screen.
 	// The screen will not be updated to reflect the new bitmap
 	void copy_rect(const byte *buf, int pitch, int x, int y, int w, int h);
@@ -81,6 +83,7 @@
 	// Format is the sample type format.
 	// Only 16-bit signed mode is needed for simon & scumm
 	bool set_sound_proc(SoundProc *proc, void *param, SoundFormat format);
+	void clear_sound_proc();
 	
 	// Get or set a property
 	uint32 property(int param, Property *value);
@@ -102,7 +105,7 @@
 	void set_timer(int timer, int (*callback)(int));
 
 	// Mutex handling
-	MutexRef create_mutex();
+	OSystem::MutexRef create_mutex();
 	void lock_mutex(MutexRef mutex);
 	void unlock_mutex(MutexRef mutex);
 	void delete_mutex(MutexRef mutex);

Index: sdl.h
===================================================================
RCS file: /cvsroot/scummvm/scummvm/backends/gp32/sdl.h,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -d -r1.1 -r1.2
--- sdl.h	2 Dec 2002 16:55:18 -0000	1.1
+++ sdl.h	21 Jul 2003 01:11:20 -0000	1.2
@@ -81,4 +81,5 @@
 
 #define SDL_SWSURFACE	0x00000000
 #define SDL_HWSURFACE	0x00000001
-#define SDL_FULLSCREEN	0x80000000
\ No newline at end of file
+#define SDL_FULLSCREEN	0x80000000
+