--- np2/sound/beep.h	2003/10/16 17:58:02	1.1.1.1
+++ np2/sound/beep.h	2005/02/07 14:46:12	1.7
@@ -1,4 +1,6 @@
 
+#if !defined(DISABLE_SOUND)
+
 enum {
 	BEEPEVENT_MAXBIT	= 8,
 	BEEPEVENT_MAX		= (1 << BEEPEVENT_MAXBIT)
@@ -13,9 +15,9 @@ typedef struct {
 	UINT16	cnt;
 	UINT16	hz;
 	int		buz;
-	int		puchi;
-	BYTE	mode;
-	BYTE	padding[3];
+	int		__puchi;
+	UINT8	mode;
+	UINT8	padding[3];
 
 	int		low;
 	int		enable;
@@ -28,7 +30,8 @@ typedef struct {
 typedef struct {
 	UINT	rate;
 	UINT	vol;
-	UINT	puchibase;
+	UINT	__puchibase;
+	UINT	samplebase;
 } BEEPCFG;
 
 
@@ -39,7 +42,9 @@ extern "C" {
 extern	_BEEP		beep;
 
 void beep_initialize(UINT rate);
+void beep_deinitialize(void);
 void beep_setvol(UINT vol);
+void beep_changeclock(void);
 
 void beep_reset(void);
 void beep_hzset(UINT16 cnt);
@@ -55,3 +60,15 @@ void SOUNDCALL beep_getpcm(BEEP bp, SINT
 }
 #endif
 
+#else
+
+#define beep_setvol(v)
+#define beep_changeclock()
+#define beep_hzset(c)
+#define beep_modeset()
+#define beep_eventreset()
+#define beep_lheventset(b)
+#define beep_oneventset()
+
+#endif
+