Merged trunk into the GUI branch.

Fixed MSVS9 project files.

svn-id: r32702

2 files changed, 4 insertions, 4 deletions

diff --git a/backends/platform/sdl/events.cpp b/backends/platform/sdl/events.cpp
index 9a0a33f45c..a4a72ca380 100644
--- a/backends/platform/sdl/events.cpp
+++ b/backends/platform/sdl/events.cpp
@@ -148,7 +148,7 @@ void OSystem_SDL::handleKbdMouse() {
 				_km.y_down_count = 1;
 			}
 
-			SDL_WarpMouse(_km.x, _km.y);
+			SDL_WarpMouse((Uint16)_km.x, (Uint16)_km.y);
 		}
 	}
 }
diff --git a/backends/platform/sdl/sdl.cpp b/backends/platform/sdl/sdl.cpp
index 866f5299a0..be3aaad926 100644
--- a/backends/platform/sdl/sdl.cpp
+++ b/backends/platform/sdl/sdl.cpp
@@ -403,10 +403,10 @@ bool OSystem_SDL::setSoundCallback(SoundProc proc, void *param) {
 		_samplesPerSec = SAMPLES_PER_SEC;
 
 	// Determine the sample buffer size. We want it to store enough data for
-	// about 1/10th of a second. Note that it must be a power of two.
+	// about 1/32th of a second. Note that it must be a power of two.
 	// So e.g. at 22050 Hz, we request a sample buffer size of 2048.
-	int samples = 0x8000;
-	while (10 * samples >= _samplesPerSec) {
+	int samples = 8192;
+	while (16 * samples >= _samplesPerSec) {
 		samples >>= 1;
 	}