Mercurial > sdl-ios-xcode

diff src/audio/windx5/SDL_dx5audio.h @ 2049:5f6550e5184f

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
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/windx5/SDL_dx5audio.h	Sun Oct 01 16:10:41 2006 +0000
+++ b/src/audio/windx5/SDL_dx5audio.h	Tue Oct 17 09:15:21 2006 +0000
@@ -21,14 +21,14 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_lowaudio_h
-#define _SDL_lowaudio_h
+#ifndef _SDL_dx5audio_h
+#define _SDL_dx5audio_h
 
 #include "directx.h"
 
 #include "../SDL_sysaudio.h"
 
-/* Hidden "this" pointer for the video functions */
+/* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *this
 
 /* The DirectSound objects */
@@ -36,23 +36,12 @@
 {
     LPDIRECTSOUND sound;
     LPDIRECTSOUNDBUFFER mixbuf;
-    int NUM_BUFFERS;
-    int mixlen, silence;
+    int num_buffers;
+    int mixlen;
     DWORD lastchunk;
     Uint8 *locked_buf;
-    HANDLE audio_event;
 };
 
-/* Old variable names */
-#define sound			(this->hidden->sound)
-#define mixbuf			(this->hidden->mixbuf)
-#define NUM_BUFFERS		(this->hidden->NUM_BUFFERS)
-#define mixlen			(this->hidden->mixlen)
-#define silence			(this->hidden->silence)
-#define lastchunk		(this->hidden->lastchunk)
-#define locked_buf		(this->hidden->locked_buf)
-#define audio_event		(this->hidden->audio_event)
-
-#endif /* _SDL_lowaudio_h */
+#endif /* _SDL_dx5audio_h */
 
 /* vi: set ts=4 sw=4 expandtab: */