rnd-20001125-3-src

[rocksndiamonds.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 2c747bd859788cd3d16f13ac5d3b759e5a1dc3e8..7ebdc65b26b0dd75b3bc2a8bdfea45cb1d0fd6b0 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -22,8 +22,14 @@
 #ifndef VOXWARE
 #define VOXWARE
 #endif
+
+#if 0
 /* where is the right declaration for 'ioctl'? */
 extern void ioctl(long, long, void *);
+#else
+#include <sys/ioctl.h>
+#endif
+
 #endif
 
 #ifdef __FreeBSD__
@@ -119,25 +125,19 @@ struct SoundHeader_8SVX
   char magic_8SVX[4];
 };
 
-struct SoundHeader_WAV
-{
-  char magic_RIFF[4];
-  unsigned long header_size;
-  char magic_WAVE[4];
-  char some_stuff[24];
-  char magic_DATA[4];
-  unsigned long data_size;
-};
-
 struct SoundInfo
 { 
   char *name;
-  byte *file_ptr;
   byte *data_ptr;
-  long file_len, data_len;
+  long data_len;
+
 #ifdef MSDOS
   SAMPLE *sample_ptr;
 #endif
+
+#ifdef TARGET_SDL
+  Mix_Chunk *mix_chunk;
+#endif
 };
 
 struct SoundControl
@@ -159,16 +159,15 @@ struct SoundControl
 #endif
 };
 
-/* sound server functions */
+/* general sound functions */
+int OpenAudio(char *);
+int CheckAudio(char *);
+boolean UnixInitAudio(void);
+
+/* sound server functions */ 
 void SoundServer(void);
-void SoundServer_InsertNewSound(struct SoundControl);
-void SoundServer_StopSound(int);
-void SoundServer_StopAllSounds(void);
-void HPUX_Audio_Control(void);
-unsigned char linear_to_ulaw(int);
-int ulaw_to_linear(unsigned char);
-
-/* application functions */
+
+/* sound client functions */
 boolean LoadSound(struct SoundInfo *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);