--- xmil/sound/sndctrl.c	2004/08/05 11:30:12	1.2
+++ xmil/sound/sndctrl.c	2005/02/04 06:42:12	1.6
@@ -1,38 +1,30 @@
 #include	"compiler.h"
+#if !defined(DISABLE_SOUND)
 #include	"soundmng.h"
 #include	"pccore.h"
 #include	"sound.h"
 #include	"sndctrl.h"
 
 
-	UINT		pcmbufsize[300];
-	UINT		framesoundcnt;
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
 	OPMCH		opmch[OPMCH_MAX];
 	_OPMGEN		opmgen;
+#endif
 	_PSGGEN		psggen;
 
 
 void sndctrl_initialize(void) {
 
 	UINT	rate;
-	UINT	lastcnt;
-	UINT	i;
-	UINT	cnt;
 
 	rate = xmilcfg.samplingrate;
-
 	sound_create(rate, xmilcfg.delayms);
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
 	opmgen_initialize(rate);
+	opmgen_setvol(xmilcfg.vol_fm);
+#endif
 	psggen_initialize(rate);
-	psggen_setvol(64);
-
-	framesoundcnt = rate / 60;
-	lastcnt = 0;
-	for (i=0; i<266; i++) {
-		cnt = (rate * (i+1)) / (60 * 266);
-		pcmbufsize[i] = cnt - lastcnt;
-		lastcnt = cnt;
-	}
+	psggen_setvol(xmilcfg.vol_ssg);
 }
 
 void sndctrl_deinitialize(void) {
@@ -43,11 +35,13 @@ void sndctrl_deinitialize(void) {
 
 void sndctrl_reset(void) {
 
+#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM)
 	opmgen_reset();
-	psggen_reset(&psggen);
-
-	sound_reset();
 	sound_streamregist(&opmgen, (SOUNDCB)opmgen_getpcm);
+#endif
+	psggen_reset(&psggen);
 	sound_streamregist(&psggen, (SOUNDCB)psggen_getpcm);
 }
 
+#endif
+