update

[l4.git] / l4 / pkg / libsdl / contrib / src / audio / SDL_audio.c

diff --git a/l4/pkg/libsdl/contrib/src/audio/SDL_audio.c b/l4/pkg/libsdl/contrib/src/audio/SDL_audio.c
index bdeacdc4e5354e7605c13960acf9040fd69a7223..beb26e0b4d90e9c25a4dffe9413b6c9f58fba553 100644 (file)
--- a/l4/pkg/libsdl/contrib/src/audio/SDL_audio.c
+++ b/l4/pkg/libsdl/contrib/src/audio/SDL_audio.c
@@ -1,6 +1,6 @@
 /*
     SDL - Simple DirectMedia Layer
-    Copyright (C) 1997-2009 Sam Lantinga
+    Copyright (C) 1997-2012 Sam Lantinga
 
     This library is free software; you can redistribute it and/or
     modify it under the terms of the GNU Lesser General Public
@@ -36,15 +36,15 @@
 
 /* Available audio drivers */
 static AudioBootStrap *bootstrap[] = {
-#if SDL_AUDIO_DRIVER_BSD
-       &BSD_AUDIO_bootstrap,
-#endif
 #if SDL_AUDIO_DRIVER_PULSE
        &PULSE_bootstrap,
 #endif
 #if SDL_AUDIO_DRIVER_ALSA
        &ALSA_bootstrap,
 #endif
+#if SDL_AUDIO_DRIVER_BSD
+       &BSD_AUDIO_bootstrap,
+#endif
 #if SDL_AUDIO_DRIVER_OSS
        &DSP_bootstrap,
        &DMA_bootstrap,
@@ -693,3 +693,11 @@ void SDL_CalculateAudioSpec(SDL_AudioSpec *spec)
        spec->size *= spec->channels;
        spec->size *= spec->samples;
 }
+
+void SDL_Audio_SetCaption(const char *caption)
+{
+       if ((current_audio) && (current_audio->SetCaption)) {
+               current_audio->SetCaption(current_audio, caption);
+       }
+}
+