Mercurial > sdl-ios-xcode

diff src/audio/SDL_audio.c @ 4729:1f7ad083fd3c

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Merged Paul's Google Summer of Code work from SDL-gsoc2010_android
author Sam Lantinga <slouken@libsdl.org>
date Sun, 22 Aug 2010 12:23:55 -0700
parents b135d19f9764 faa228f7ce5b
children fff50e86c891 27c458e4ae31
line wrap: on
line diff
--- a/src/audio/SDL_audio.c	Sun Aug 22 12:07:55 2010 -0700
+++ b/src/audio/SDL_audio.c	Sun Aug 22 12:23:55 2010 -0700
@@ -69,6 +69,7 @@
 extern AudioBootStrap DART_bootstrap;
 extern AudioBootStrap NDSAUD_bootstrap;
 extern AudioBootStrap FUSIONSOUND_bootstrap;
+extern AudioBootStrap ANDROIDAUD_bootstrap;
 
 
 /* Available audio drivers */
@@ -137,6 +138,9 @@
 #if SDL_AUDIO_DRIVER_FUSIONSOUND
     &FUSIONSOUND_bootstrap,
 #endif
+#if SDL_AUDIO_DRIVER_ANDROID
+    &ANDROIDAUD_bootstrap,
+#endif
     NULL
 };
 
@@ -318,6 +322,8 @@
 }
 
 
+#include <android/log.h>
+
 /* The general mixing thread function */
 int SDLCALL
 SDL_RunAudio(void *devicep)