clean up
Merge branch 'SDL_OpenAudio'