--- deliantra/Deliantra-Client/Client.xs	2006/04/30 09:21:47	1.70
+++ deliantra/Deliantra-Client/Client.xs	2006/05/08 18:28:40	1.75
@@ -1,5 +1,6 @@
 #ifdef _WIN32
 # include <malloc.h>
+# pragma warning(disable:4244)
 #endif
 
 #include "EXTERN.h"
@@ -260,7 +261,7 @@
 }
 
 static void
-music_finished ()
+music_finished (void)
 {
   SDL_UserEvent ev;
 
@@ -272,6 +273,19 @@
   SDL_PushEvent ((SDL_Event *)&ev);
 }
 
+static void
+channel_finished (int channel)
+{
+  SDL_UserEvent ev;
+
+  ev.type  = SDL_USEREVENT;
+  ev.code  = 1;
+  ev.data1 = (void *)(long)channel;
+  ev.data2 = 0;
+
+  SDL_PushEvent ((SDL_Event *)&ev);
+}
+
 MODULE = CFClient	PACKAGE = CFClient
 
 PROTOTYPES: ENABLE
@@ -490,6 +504,12 @@
                   hv_store (hv, "x",      1, newSViv (ev.button.x), 0);
                   hv_store (hv, "y",      1, newSViv (ev.button.y), 0);
                   break;
+
+                case SDL_USEREVENT:
+                  hv_store (hv, "code",   4, newSViv (ev.user.code), 0);
+                  hv_store (hv, "data1",  5, newSViv ((IV)ev.user.data1), 0);
+                  hv_store (hv, "data2",  5, newSViv ((IV)ev.user.data2), 0);
+                  break;
               }
 
             XPUSHs (sv_2mortal (newRV_noinc ((SV *)hv)));
@@ -497,9 +517,10 @@
 }
 
 int
-Mix_OpenAudio (int frequency = 22050, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 512)
+Mix_OpenAudio (int frequency = 48000, int format = MIX_DEFAULT_FORMAT, int channels = 1, int chunksize = 2048)
   	POSTCALL:
         Mix_HookMusicFinished (music_finished);
+        Mix_ChannelFinished (channel_finished);
 
 void
 Mix_CloseAudio ()