Mercurial > sdl-ios-xcode
diff src/audio/dma/SDL_dmaaudio.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/dma/SDL_dmaaudio.h Sun Oct 01 16:10:41 2006 +0000 +++ b/src/audio/dma/SDL_dmaaudio.h Tue Oct 17 09:15:21 2006 +0000 @@ -21,12 +21,12 @@ */ #include "SDL_config.h" -#ifndef _SDL_dspaudio_h -#define _SDL_dspaudio_h +#ifndef _SDL_dmaaudio_h +#define _SDL_dmaaudio_h #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 @@ -49,6 +49,7 @@ #define FUDGE_TICKS 10 /* The scheduler overhead ticks per frame */ /* Old variable names */ +/* !!! FIXME: remove these. */ #define audio_fd (this->hidden->audio_fd) #define parent (this->hidden->parent) #define dma_buf (this->hidden->dma_buf) @@ -57,5 +58,6 @@ #define frame_ticks (this->hidden->frame_ticks) #define next_frame (this->hidden->next_frame) -#endif /* _SDL_dspaudio_h */ +#endif /* _SDL_dmaaudio_h */ + /* vi: set ts=4 sw=4 expandtab: */