rnd-20001128-1-src

[rocksndiamonds.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 7ebdc65b26b0dd75b3bc2a8bdfea45cb1d0fd6b0..811a7bb9c9ee620c99786eb56dbd8c0990de3b8e 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -45,14 +45,14 @@ extern void ioctl(long, long, void *);
 #define HPUX_AUDIO
 #endif /* _HPUX_SOURCE */
 
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
 #define MAX_SOUNDS_PLAYING     16
 #else
 #define MAX_SOUNDS_PLAYING     8
 #endif
 
 /* some values for PlaySound(), StopSound() and friends */
-#ifndef MSDOS
+#if !defined(PLATFORM_MSDOS)
 #define PSND_SILENCE           0
 #define PSND_MAX_VOLUME_BITS   7
 #define PSND_MIN_VOLUME                0
@@ -125,17 +125,17 @@ struct SoundHeader_8SVX
   char magic_8SVX[4];
 };
 
-struct SoundInfo
+struct SampleInfo
 { 
   char *name;
   byte *data_ptr;
   long data_len;
 
-#ifdef MSDOS
+#if defined(PLATFORM_MSDOS)
   SAMPLE *sample_ptr;
 #endif
 
-#ifdef TARGET_SDL
+#if defined(TARGET_SDL)
   Mix_Chunk *mix_chunk;
 #endif
 };
@@ -154,7 +154,8 @@ struct SoundControl
   long playingpos;
   long data_len;
   byte *data_ptr;
-#ifdef MSDOS
+
+#if defined(PLATFORM_MSDOS)
   int voice;
 #endif
 };
@@ -168,7 +169,7 @@ boolean UnixInitAudio(void);
 void SoundServer(void);
 
 /* sound client functions */
-boolean LoadSound(struct SoundInfo *);
+boolean LoadSound(struct SampleInfo *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);