diff src/audio/windib/SDL_dibaudio.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/windib/SDL_dibaudio.h	Sun Oct 01 16:10:41 2006 +0000
+++ b/src/audio/windib/SDL_dibaudio.h	Tue Oct 17 09:15:21 2006 +0000
@@ -21,12 +21,12 @@
 */
 #include "SDL_config.h"
 
-#ifndef _SDL_lowaudio_h
-#define _SDL_lowaudio_h
+#ifndef _SDL_dibaudio_h
+#define _SDL_dibaudio_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           /* -- Don't lower this! */
@@ -40,12 +40,6 @@
     int next_buffer;
 };
 
-/* Old variable names */
-#define sound			(this->hidden->sound)
-#define audio_sem 		(this->hidden->audio_sem)
-#define mixbuf			(this->hidden->mixbuf)
-#define wavebuf			(this->hidden->wavebuf)
-#define next_buffer		(this->hidden->next_buffer)
+#endif /* _SDL_dibaudio_h */
 
-#endif /* _SDL_lowaudio_h */
 /* vi: set ts=4 sw=4 expandtab: */