Mercurial > sdl-ios-xcode

comparison 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
comparison
equal deleted inserted replaced
4694:c24ba2cc9583 4729:1f7ad083fd3c
67 extern AudioBootStrap DCAUD_bootstrap; 67 extern AudioBootStrap DCAUD_bootstrap;
68 extern AudioBootStrap MMEAUDIO_bootstrap; 68 extern AudioBootStrap MMEAUDIO_bootstrap;
69 extern AudioBootStrap DART_bootstrap; 69 extern AudioBootStrap DART_bootstrap;
70 extern AudioBootStrap NDSAUD_bootstrap; 70 extern AudioBootStrap NDSAUD_bootstrap;
71 extern AudioBootStrap FUSIONSOUND_bootstrap; 71 extern AudioBootStrap FUSIONSOUND_bootstrap;
72 extern AudioBootStrap ANDROIDAUD_bootstrap;
72 73
73 74
74 /* Available audio drivers */ 75 /* Available audio drivers */
75 static const AudioBootStrap *const bootstrap[] = { 76 static const AudioBootStrap *const bootstrap[] = {
76 #if SDL_AUDIO_DRIVER_PULSEAUDIO 77 #if SDL_AUDIO_DRIVER_PULSEAUDIO
134 #if SDL_AUDIO_DRIVER_NDS 135 #if SDL_AUDIO_DRIVER_NDS
135 &NDSAUD_bootstrap, 136 &NDSAUD_bootstrap,
136 #endif 137 #endif
137 #if SDL_AUDIO_DRIVER_FUSIONSOUND 138 #if SDL_AUDIO_DRIVER_FUSIONSOUND
138 &FUSIONSOUND_bootstrap, 139 &FUSIONSOUND_bootstrap,
140 #endif
141 #if SDL_AUDIO_DRIVER_ANDROID
142 &ANDROIDAUD_bootstrap,
139 #endif 143 #endif
140 NULL 144 NULL
141 }; 145 };
142 146
143 static SDL_AudioDevice * 147 static SDL_AudioDevice *
315 if (stream->buffer != NULL) { 319 if (stream->buffer != NULL) {
316 SDL_free(stream->buffer); 320 SDL_free(stream->buffer);
317 } 321 }
318 } 322 }
319 323
324
325 #include <android/log.h>
320 326
321 /* The general mixing thread function */ 327 /* The general mixing thread function */
322 int SDLCALL 328 int SDLCALL
323 SDL_RunAudio(void *devicep) 329 SDL_RunAudio(void *devicep)
324 { 330 {