--- np2/x11/soundmng.h	2003/11/17 13:42:55	1.2
+++ np2/x11/soundmng.h	2011/01/15 19:16:58	1.7
@@ -1,9 +1,7 @@
 #ifndef	NP2_X11_SOUNGMNG_H__
 #define	NP2_X11_SOUNGMNG_H__
 
-#ifdef __cplusplus
-extern "C" {
-#endif
+G_BEGIN_DECLS
 
 enum {
 	SOUND_PCMSEEK,
@@ -13,9 +11,6 @@ enum {
 
 enum {
 	SNDDRV_NODRV,
-	SNDDRV_NETBSD,
-	SNDDRV_OSS,
-	SNDDRV_ESD,
 	SNDDRV_SDL,
 	SNDDRV_DRVMAX
 };
@@ -24,44 +19,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,15 +37,10 @@ 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 */
 
-#define soundmng_create(rate, ms)	0, (void)rate, (void)ms
+#define soundmng_create(rate, ms)	0
 #define	soundmng_destroy()
 #define	soundmng_reset()
 #define	soundmng_play()
@@ -109,8 +61,6 @@ void nosound_pcmvolume(void *chanp, UINT
 
 #endif	/* !NOSOUND */
 
-#ifdef __cplusplus
-}
-#endif
+G_END_DECLS
 
 #endif	/* NP2_X11_SOUNGMNG_H__ */