Mercurial > sdl-ios-xcode
diff src/audio/SDL_mixer.c @ 2049:5f6550e5184f
Merged SDL-ryan-multiple-audio-device branch r2803:2871 into the trunk.
| author | Ryan C. Gordon <icculus@icculus.org> |
|---|---|
| date | Tue, 17 Oct 2006 09:15:21 +0000 |
| parents | 7abe37467fa5 |
| children | 3ee59c43d784 |
line wrap: on
line diff
--- a/src/audio/SDL_mixer.c Sun Oct 01 16:10:41 2006 +0000 +++ b/src/audio/SDL_mixer.c Tue Oct 17 09:15:21 2006 +0000 @@ -89,21 +89,6 @@ #define ADJUST_VOLUME(s, v) (s = (s*v)/SDL_MIX_MAXVOLUME) #define ADJUST_VOLUME_U8(s, v) (s = (((s-128)*v)/SDL_MIX_MAXVOLUME)+128) -void -SDL_MixAudio(Uint8 * dst, const Uint8 * src, Uint32 len, int volume) -{ - /* Mix the user-level audio format */ - if (current_audio) { - SDL_AudioFormat format; - if (current_audio->convert.needed) { - format = current_audio->convert.src_format; - } else { - format = current_audio->spec.format; - } - SDL_MixAudioFormat(dst, src, format, len, volume); - } -} - void SDL_MixAudioFormat(Uint8 * dst, const Uint8 * src, SDL_AudioFormat format,