rnd-20001129-2-src

[rocksndiamonds.git] / src / sound.h

diff --git a/src/sound.h b/src/sound.h
index 28d7ba21ef2d8c89099d165c9138e07655cf3fb4..c03fdaf1f1d935678ff919ba6ad87cd796c59c38 100644 (file)
--- a/src/sound.h
+++ b/src/sound.h
@@ -90,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
@@ -99,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;
@@ -125,7 +117,7 @@ struct SoundHeader_8SVX
   char magic_8SVX[4];
 };
 
-struct SoundInfo
+struct SampleInfo
 { 
   char *name;
   byte *data_ptr;
@@ -161,15 +153,14 @@ struct SoundControl
 };
 
 /* general sound functions */
-int OpenAudio(char *);
-int CheckAudio(char *);
-boolean UnixInitAudio(void);
+void UnixOpenAudio(struct AudioSystemInfo *);
+void UnixCloseAudio(struct AudioSystemInfo *);
 
 /* sound server functions */ 
 void SoundServer(void);
 
 /* sound client functions */
-boolean LoadSound(struct SoundInfo *);
+boolean LoadSound(struct SampleInfo *);
 void PlaySound(int);
 void PlaySoundStereo(int, int);
 void PlaySoundLoop(int);