--- np2/sound/sound.h	2004/03/24 06:07:57	1.7
+++ np2/sound/sound.h	2005/02/09 20:11:35	1.9
@@ -3,6 +3,8 @@
 #define	SOUNDCALL
 #endif
 
+#if !defined(DISABLE_SOUND)
+
 typedef void (SOUNDCALL * SOUNDCB)(void *hdl, SINT32 *pcm, UINT count);
 
 typedef struct {
@@ -80,8 +82,8 @@ typedef struct {
 extern "C" {
 #endif
 
-BOOL pcmmix_regist(PMIXDAT *dat, void *datptr, UINT datsize, UINT rate);
-BOOL pcmmix_regfile(PMIXDAT *dat, const char *fname, UINT rate);
+BRESULT pcmmix_regist(PMIXDAT *dat, void *datptr, UINT datsize, UINT rate);
+BRESULT pcmmix_regfile(PMIXDAT *dat, const OEMCHAR *fname, UINT rate);
 
 void SOUNDCALL pcmmix_getpcm(PCMMIX hdl, SINT32 *pcm, UINT count);
 
@@ -89,3 +91,13 @@ void SOUNDCALL pcmmix_getpcm(PCMMIX hdl,
 }
 #endif
 
+#else
+
+#define sound_pcmlock()		(NULL)
+#define sound_pcmunlock(h)
+#define sound_reset()
+#define sound_changeclock()
+#define sound_sync()
+
+#endif
+