3 files changed, 38 insertions, 1 deletions
diff --git a/pcsound/pcsound.c b/pcsound/pcsound.c
index 0746e24e..4695e6e1 100644
--- a/pcsound/pcsound.c
+++ b/pcsound/pcsound.c
@@ -27,6 +27,10 @@
 #include <stdlib.h>
 #include <string.h>
 
+#ifdef _WIN32_WCE
+#include "libc_wince.h"
+#endif
+
 #include "config.h"
 #include "pcsound.h"
 #include "pcsound_internal.h"
diff --git a/pcsound/pcsound_sdl.c b/pcsound/pcsound_sdl.c
index f862dfa7..6ba06785 100644
--- a/pcsound/pcsound_sdl.c
+++ b/pcsound/pcsound_sdl.c
@@ -32,6 +32,7 @@
 #include "pcsound.h"
 #include "pcsound_internal.h"
 
+#define MAX_SOUND_SLICE_TIME 70 /* ms */
 #define SQUARE_WAVE_AMP 0x2000
 
 // If true, we initialised SDL and have the responsibility to shut it 
@@ -163,8 +164,37 @@ static void PCSound_SDL_Shutdown(void)
     }
 }
 
+// Calculate slice size, based on MAX_SOUND_SLICE_TIME.
+// The result must be a power of two.
+
+static int GetSliceSize(void)
+{
+    int limit;
+    int n;
+
+    limit = (pcsound_sample_rate * MAX_SOUND_SLICE_TIME) / 1000;
+
+    // Try all powers of two, not exceeding the limit.
+
+    for (n=0;; ++n)
+    {
+        // 2^n <= limit < 2^n+1 ?
+
+        if ((1 << (n + 1)) > limit)
+        {
+            return (1 << n);
+        }
+    }
+
+    // Should never happen?
+
+    return 1024;
+}
+
 static int PCSound_SDL_Init(pcsound_callback_func callback_func)
 {
+    int slicesize;
+
     // Check if SDL_mixer has been opened already
     // If not, we must initialise it now
 
@@ -176,7 +206,9 @@ static int PCSound_SDL_Init(pcsound_callback_func callback_func)
             return 0;
         }
 
-        if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, 1024) < 0)
+        slicesize = GetSliceSize();
+
+        if (Mix_OpenAudio(pcsound_sample_rate, AUDIO_S16SYS, 2, slicesize) < 0)
         {
             fprintf(stderr, "Error initialising SDL_mixer: %s\n", Mix_GetError());
 
diff --git a/pcsound/pcsound_win32.c b/pcsound/pcsound_win32.c
index 7976b444..0eb8cd6a 100644
--- a/pcsound/pcsound_win32.c
+++ b/pcsound/pcsound_win32.c
@@ -26,6 +26,7 @@
 #ifdef _WIN32
 
 #include "SDL.h"
+#include "SDL_thread.h"
 #include <windows.h>
 
 #include "pcsound.h"