Mercurial > sdl-ios-xcode
diff src/audio/macosx/SDL_coreaudio.h @ 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 | c121d94672cb |
children | 72cc2226d6a3 |
line wrap: on
line diff
--- a/src/audio/macosx/SDL_coreaudio.h Sun Oct 01 16:10:41 2006 +0000 +++ b/src/audio/macosx/SDL_coreaudio.h Tue Oct 17 09:15:21 2006 +0000 @@ -26,22 +26,17 @@ #include "../SDL_sysaudio.h" -/* Hidden "this" pointer for the video functions */ +/* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this struct SDL_PrivateAudioData { - AudioUnit outputAudioUnit; + AudioUnit audioUnit; void *buffer; UInt32 bufferOffset; UInt32 bufferSize; + AudioDeviceID deviceID; }; -/* Old variable names */ -#define outputAudioUnit (this->hidden->outputAudioUnit) -#define buffer (this->hidden->buffer) -#define bufferOffset (this->hidden->bufferOffset) -#define bufferSize (this->hidden->bufferSize) - #endif /* _SDL_coreaudio_h */ /* vi: set ts=4 sw=4 expandtab: */