Mercurial > sdl-ios-xcode

diff src/audio/macrom/SDL_romaudio.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/macrom/SDL_romaudio.h	Sun Oct 01 16:10:41 2006 +0000
+++ b/src/audio/macrom/SDL_romaudio.h	Tue Oct 17 09:15:21 2006 +0000
@@ -26,27 +26,14 @@
 
 #include "../SDL_sysaudio.h"
 
-/* This is Ryan's improved MacOS sound code, with locking support */
-#define USE_RYANS_SOUNDCODE
-
-/* Hidden "this" pointer for the video functions */
+/* Hidden "this" pointer for the audio functions */
 #define _THIS	SDL_AudioDevice *this
 
 struct SDL_PrivateAudioData
 {
     /* Sound manager audio channel */
     SndChannelPtr channel;
-#if defined(TARGET_API_MAC_CARBON) || defined(USE_RYANS_SOUNDCODE)
-    /* FIXME: Add Ryan's static data here */
-#else
-    /* Double buffering variables */
-    SndDoubleBufferPtr audio_buf[2];
-#endif
 };
 
-/* Old variable names */
-#define channel		(this->hidden->channel)
-#define audio_buf	(this->hidden->audio_buf)
-
 #endif /* _SDL_romaudio_h */
 /* vi: set ts=4 sw=4 expandtab: */