rnd-20001203-5-src

[rocksndiamonds.git] / src / libgame / sound.h

diff --git a/src/libgame/sound.h b/src/libgame/sound.h
index 238a5b19dfea138b47a1448b8d35f221ec39c0ea..f75ad477ae09737709b69b927114a82f59022d06 100644 (file)
--- a/src/libgame/sound.h
+++ b/src/libgame/sound.h
@@ -16,23 +16,22 @@
 
 #include <math.h>
 
+#include "platform.h"
+
 #if defined(PLATFORM_LINUX)
 #include <sys/ioctl.h>
 #endif
 
-#define SND_BLOCKSIZE 4096
-
 #if defined(PLATFORM_LINUX)
 #include <linux/soundcard.h>
 #elif defined(PLATFORM_FREEBSD)
 #include <machine/soundcard.h>
 #elif defined(PLATFORM_HPUX)
 #include <sys/audio.h>
-#undef  SND_BLOCKSIZE
-#define SND_BLOCKSIZE 32768
 #endif
 
-#include "libgame.h"
+#include "system.h"
+
 
 #if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
 #define AUDIO_STREAMING_DSP
@@ -44,6 +43,12 @@
 #define MAX_SOUNDS_PLAYING     8
 #endif
 
+#if !defined(PLATFORM_HPUX)
+#define SND_BLOCKSIZE 4096
+#else
+#define SND_BLOCKSIZE 32768
+#endif
+
 /* some values for PlaySound(), StopSound() and friends */
 #if !defined(PLATFORM_MSDOS)
 #define PSND_SILENCE           0
@@ -155,7 +160,8 @@ void UnixCloseAudio(struct AudioSystemInfo *);
 void SoundServer(void);
 
 /* sound client functions */
-boolean LoadSound(struct SampleInfo *);
+void AllocSoundArray(int);
+boolean LoadSound(int, char *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);