--- np2/x11/soundmng.h 2003/11/17 13:42:55 1.2 +++ np2/x11/soundmng.h 2008/04/02 13:04:00 1.5 @@ -1,3 +1,5 @@ +/* $Id: soundmng.h,v 1.5 2008/04/02 13:04:00 monaka Exp $ */ + #ifndef NP2_X11_SOUNGMNG_H__ #define NP2_X11_SOUNGMNG_H__ @@ -13,9 +15,6 @@ enum { enum { SNDDRV_NODRV, - SNDDRV_NETBSD, - SNDDRV_OSS, - SNDDRV_ESD, SNDDRV_SDL, SNDDRV_DRVMAX }; @@ -24,44 +23,6 @@ BYTE snddrv_drv2num(const char *); const char *snddrv_num2drv(BYTE); #if !defined(NOSOUND) - -#ifndef NSOUNDBUFFER -#define NSOUNDBUFFER 2 -#endif - -typedef struct { - BOOL (*drvinit)(UINT rate, UINT samples); - BOOL (*drvterm)(void); - - void (*sndplay)(void); - void (*sndstop)(void); - - void *(*pcmload)(UINT num, const char *path); - void (*pcmdestroy)(void *chanp, UINT num); - void (*pcmplay)(void *chanp, UINT num, BOOL loop); - void (*pcmstop)(void *chanp, UINT num); - void (*pcmvolume)(void *chanp, UINT num, int volume); -} snddrv_t; - -extern int audio_fd; -extern snddrv_t snddrv; - -extern int sound_nextbuf; -extern char *sound_event; -extern char *sound_buffer[NSOUNDBUFFER]; - -UINT calc_blocksize(UINT size); -UINT calc_fragment(UINT size); - -BOOL netbsdaudio_setup(void); -BOOL ossaudio_setup(void); -BOOL esdaudio_setup(void); -BOOL sdlaudio_setup(void); -BOOL sdlmixer_setup(void); - -void snddrv_play(void); -void snddrv_stop(void); - UINT soundmng_create(UINT rate, UINT ms); void soundmng_destroy(void); void soundmng_reset(void); @@ -80,11 +41,6 @@ void soundmng_deinitialize(void); BOOL soundmng_pcmload(UINT num, const char *filename); void soundmng_pcmvolume(UINT num, int volume); -void *nosound_pcmload(UINT num, const char *); -void nosound_pcmdestroy(void *chanp, UINT num); -void nosound_pcmplay(void *chanp, UINT num, BOOL loop); -void nosound_pcmstop(void *chanp, UINT num); -void nosound_pcmvolume(void *chanp, UINT num, int volume); #else /* NOSOUND */