--- deliantra/Deliantra-Client/Client.xs	2009/12/24 10:47:45	1.300
+++ deliantra/Deliantra-Client/Client.xs	2010/04/20 10:53:11	1.302
@@ -2800,9 +2800,15 @@
             RETVAL = Mix_GroupOldest (-1);
 
             if (RETVAL < 0)
-              XSRETURN_UNDEF;
-
-            Mix_HaltChannel (RETVAL);
+              {
+                // happens sometimes, maybe it just stopped playing(?)
+                RETVAL = Mix_GroupAvailable (-1);
+
+                if (RETVAL < 0)
+                  XSRETURN_UNDEF;
+              }
+            else
+              Mix_HaltChannel (RETVAL);
           }
 
         Mix_UnregisterAllEffects (RETVAL);
@@ -2872,6 +2878,18 @@
 
 PROTOTYPES: DISABLE
 
+void
+decoders ()
+	PPCODE:
+#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
+        int i, num = Mix_GetNumChunkDecoders ();
+        EXTEND (SP, num);
+        for (i = 0; i < num; ++i)
+          PUSHs (sv_2mortal (newSVpv (Mix_GetChunkDecoder (i), 0)));
+#else
+        XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
+#endif
+
 DC::MixChunk
 new (SV *class, DC::RW rwops)
 	CODE:
@@ -2913,6 +2931,18 @@
 
 MODULE = Deliantra::Client	PACKAGE = DC::MixMusic
 
+void
+decoders ()
+	PPCODE:
+#if SDL_MIXER_MAJOR_VERSION > 1 || SDL_MIXER_MINOR_VERSION > 2 || SDL_MIXER_PATCHLEVEL >= 10
+        int i, num = Mix_GetNumMusicDecoders ();
+        EXTEND (SP, num);
+        for (i = 0; i < num; ++i)
+          PUSHs (sv_2mortal (newSVpv (Mix_GetMusicDecoder (i), 0)));
+#else
+        XPUSHs (sv_2mortal (newSVpv ("(sdl mixer too old)", 0)));
+#endif
+
 int
 volume (int volume = -1)
 	PROTOTYPE: ;$
@@ -2933,6 +2963,13 @@
 	CODE:
         Mix_HaltMusic ();
 
+int
+playing ()
+	CODE:
+        RETVAL = Mix_PlayingMusic ();
+	OUTPUT:
+        RETVAL
+
 DC::MixMusic
 new (SV *class, DC::RW rwops)
 	CODE: