projects
/
rocksndiamonds.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
rnd-20001129-2-src
[rocksndiamonds.git]
/
src
/
sound.h
diff --git
a/src/sound.h
b/src/sound.h
index a4f9d878cb2a47b9366711d7646f91da3e995a1d..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 SND_PATH "./sounds"
#endif
-#define DEV_AUDIO "/dev/audio"
#define DEV_DSP "/dev/dsp"
#define DEV_DSP "/dev/dsp"
+#define DEV_AUDIO "/dev/audio"
+#define DEV_AUDIOCTL "/dev/audioCtl"
#ifdef VOXWARE
#define SOUND_DEVICE DEV_DSP
#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_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;
struct SoundHeader_SUN
{
unsigned long magic;
@@
-161,9
+153,8
@@
struct SoundControl
};
/* general sound functions */
};
/* general sound functions */
-int OpenAudio(char *);
-int CheckAudio(char *);
-void UnixInitAudio(struct AudioSystemInfo *);
+void UnixOpenAudio(struct AudioSystemInfo *);
+void UnixCloseAudio(struct AudioSystemInfo *);
/* sound server functions */
void SoundServer(void);
/* sound server functions */
void SoundServer(void);