rnd-20001129-2-src

[rocksndiamonds.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 47807ddec92d962897a80b4ae46fd76ceb8e3a0d..c03fdaf1f1d935678ff919ba6ad87cd796c59c38 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__
@@ -39,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
@@ -84,8 +90,9 @@ extern void ioctl(long, long, void *);
 #define SND_PATH       "./sounds"
 #endif
 
-#define DEV_AUDIO      "/dev/audio"
 #define DEV_DSP                "/dev/dsp"
+#define DEV_AUDIO      "/dev/audio"
+#define DEV_AUDIOCTL   "/dev/audioCtl"
 
 #ifdef VOXWARE
 #define SOUND_DEVICE           DEV_DSP
@@ -93,15 +100,6 @@ extern void ioctl(long, long, void *);
 #define SOUND_DEVICE   DEV_AUDIO
 #endif
 
-#define SOUND_OFF      0
-#define        SOUND_AVAILABLE 1
-
-#ifdef NO_SOUNDS
-#define SOUND_STATUS   SOUND_OFF
-#else
-#define SOUND_STATUS   SOUND_AVAILABLE
-#endif
-
 struct SoundHeader_SUN
 {
   unsigned long magic;
@@ -119,25 +117,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
+struct SampleInfo
 { 
-  unsigned char *name;
-  unsigned char *file_ptr;
-  char *data_ptr;
-  long file_len, data_len;
-#ifdef MSDOS
+  char *name;
+  byte *data_ptr;
+  long data_len;
+
+#if defined(PLATFORM_MSDOS)
   SAMPLE *sample_ptr;
 #endif
+
+#if defined(TARGET_SDL)
+  Mix_Chunk *mix_chunk;
+#endif
 };
 
 struct SoundControl
@@ -153,23 +145,22 @@ struct SoundControl
   int playingtime;
   long playingpos;
   long data_len;
-  char *data_ptr;
-#ifdef MSDOS
+  byte *data_ptr;
+
+#if defined(PLATFORM_MSDOS)
   int voice;
 #endif
 };
 
-/* sound server functions */
+/* general sound functions */
+void UnixOpenAudio(struct AudioSystemInfo *);
+void UnixCloseAudio(struct AudioSystemInfo *);
+
+/* 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 */
-boolean LoadSound(struct SoundInfo *);
+
+/* sound client functions */
+boolean LoadSound(struct SampleInfo *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);