projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001130-1-src
[rocksndiamonds.git]
/
src
/
sound.h
diff --git
a/src/sound.h
b/src/sound.h
index c03fdaf1f1d935678ff919ba6ad87cd796c59c38..16fe71de0a131a36018842ece036583355d5d0f0 100644
(file)
--- a/
src/sound.h
+++ b/
src/sound.h
@@
-14,36
+14,28
@@
#ifndef SOUND_H
#define SOUND_H
#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>
#include <sys/ioctl.h>
-#endif
-
-#endif
-
-#ifdef __FreeBSD__
-#include <machine/soundcard.h>
-#endif
+#include <math.h>
#define SND_BLOCKSIZE 4096
#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
#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
#if !defined(PLATFORM_MSDOS)
#define MAX_SOUNDS_PLAYING 16
@@
-90,14
+82,14
@@
extern void ioctl(long, long, void *);
#define SND_PATH "./sounds"
#endif
#define SND_PATH "./sounds"
#endif
-#define DEV
_DSP
"/dev/dsp"
-#define DEV
_AUDIO
"/dev/audio"
-#define DEV
_AUDIOCTL
"/dev/audioCtl"
+#define DEV
ICENAME_DSP
"/dev/dsp"
+#define DEV
ICENAME_AUDIO
"/dev/audio"
+#define DEV
ICENAME_AUDIOCTL
"/dev/audioCtl"
-#if
def VOXWARE
-#define
SOUND_DEVICE DEV
_DSP
+#if
defined(AUDIO_STREAMING_DSP)
+#define
AUDIO_DEVICE DEVICENAME
_DSP
#else
#else
-#define
SOUND_DEVICE DEV
_AUDIO
+#define
AUDIO_DEVICE DEVICENAME
_AUDIO
#endif
struct SoundHeader_SUN
#endif
struct SoundHeader_SUN