X-Git-Url: https://git.artsoft.org/?a=blobdiff_plain;f=src%2Fsound.h;h=16fe71de0a131a36018842ece036583355d5d0f0;hb=228a5718ede5ee00512ed2e333b3cee47baa124c;hp=28d7ba21ef2d8c89099d165c9138e07655cf3fb4;hpb=4bca9bc5f299a9b287134b06e41b147f506792b4;p=rocksndiamonds.git

diff --git a/src/sound.h b/src/sound.h
index 28d7ba21..16fe71de 100644
--- a/src/sound.h
+++ b/src/sound.h
@@ -14,36 +14,28 @@
 #ifndef SOUND_H
 #define SOUND_H
 
-#include <math.h>
-#include "main.h"
-
-#ifdef linux
-#include <linux/soundcard.h>
-#ifndef VOXWARE
-#define VOXWARE
-#endif
+#include "platform.h"
 
-#if 0
-/* where is the right declaration for 'ioctl'? */
-extern void ioctl(long, long, void *);
-#else
 #include <sys/ioctl.h>
-#endif
-
-#endif
-
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#endif
+#include <math.h>
 
 #define SND_BLOCKSIZE 4096
 
-#ifdef _HPUX_SOURCE
+#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
-#define HPUX_AUDIO
-#endif /* _HPUX_SOURCE */
+#endif
+
+#include "main.h"
+
+#if defined(PLATFORM_LINUX) || defined(PLATFORM_FREEBSD) || defined(VOXWARE)
+#define AUDIO_STREAMING_DSP
+#endif
 
 #if !defined(PLATFORM_MSDOS)
 #define MAX_SOUNDS_PLAYING	16
@@ -90,22 +82,14 @@ extern void ioctl(long, long, void *);
 #define SND_PATH	"./sounds"
 #endif
 
-#define DEV_AUDIO	"/dev/audio"
-#define DEV_DSP		"/dev/dsp"
-
-#ifdef	VOXWARE
-#define SOUND_DEVICE   	DEV_DSP
-#else
-#define SOUND_DEVICE	DEV_AUDIO
-#endif
-
-#define SOUND_OFF	0
-#define	SOUND_AVAILABLE	1
+#define DEVICENAME_DSP		"/dev/dsp"
+#define DEVICENAME_AUDIO	"/dev/audio"
+#define DEVICENAME_AUDIOCTL	"/dev/audioCtl"
 
-#ifdef NO_SOUNDS
-#define SOUND_STATUS	SOUND_OFF
+#if defined(AUDIO_STREAMING_DSP)
+#define AUDIO_DEVICE   	DEVICENAME_DSP
 #else
-#define SOUND_STATUS	SOUND_AVAILABLE
+#define AUDIO_DEVICE	DEVICENAME_AUDIO
 #endif
 
 struct SoundHeader_SUN
@@ -125,7 +109,7 @@ struct SoundHeader_8SVX
   char magic_8SVX[4];
 };
 
-struct SoundInfo
+struct SampleInfo
 { 
   char *name;
   byte *data_ptr;
@@ -161,15 +145,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);