Mercurial > sdl-ios-xcode
diff src/audio/mme/SDL_mmeaudio.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 | 99210400e8b9 |
line wrap: on
line diff
--- a/src/audio/mme/SDL_mmeaudio.h Sun Oct 01 16:10:41 2006 +0000 +++ b/src/audio/mme/SDL_mmeaudio.h Tue Oct 17 09:15:21 2006 +0000 @@ -23,12 +23,12 @@ /* Allow access to a raw mixing buffer */ -#ifndef _SDL_lowaudio_h -#define _SDL_lowaudio_h +#ifndef _SDL_mmeaudio_h +#define _SDL_mmeaudio_h #include "../SDL_sysaudio.h" -/* Hidden "this" pointer for the video functions */ +/* Hidden "this" pointer for the audio functions */ #define _THIS SDL_AudioDevice *this #define NUM_BUFFERS 2 @@ -46,9 +46,6 @@ int next_buffer; }; -#define shm (this->hidden->shm) -#define mixbuf (this->hidden->mixbuf) -#define next_buffer (this->hidden->next_buffer) -/* Old variable names */ -#endif /* _SDL_lowaudio_h */ +#endif /* _SDL_mmeaudio_h */ + /* vi: set ts=4 sw=4 expandtab: */