--- xmil/sound/opmgeng.c 2004/08/01 05:31:31 1.1 +++ xmil/sound/opmgeng.c 2005/02/04 06:42:12 1.3 @@ -1,11 +1,12 @@ #include "compiler.h" + +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) + #include "sound.h" #include "sndctrl.h" - extern OPMCFG opmcfg; - #define CALCENV(e, c, s) \ (c)->slot[(s)].freq_cnt += (c)->slot[(s)].freq_inc; \ (c)->slot[(s)].env_cnt += (c)->slot[(s)].env_inc; \ @@ -131,14 +132,14 @@ void SOUNDCALL opmgen_getpcm(void *hdl, } } samp_l += opmgen.outdl * opmgen.calcremain; -// samp_l >>= 8; -// samp_l *= opmcfg.fmvol; - samp_l >>= (OPM_OUTSB + FMDIV_BITS + 1 + 0 - FMVOL_SFTBIT - 0); + samp_l >>= 8; + samp_l *= opmcfg.fmvol; + samp_l >>= (OPM_OUTSB + FMDIV_BITS + 1 + 6 - FMVOL_SFTBIT - 8); pcm[0] += samp_l; samp_r += opmgen.outdr * opmgen.calcremain; -// samp_r >>= 8; -// samp_r *= opmcfg.fmvol; - samp_r >>= (OPM_OUTSB + FMDIV_BITS + 1 + 0 - FMVOL_SFTBIT - 0); + samp_r >>= 8; + samp_r *= opmcfg.fmvol; + samp_r >>= (OPM_OUTSB + FMDIV_BITS + 1 + 6 - FMVOL_SFTBIT - 8); pcm[1] += samp_r; opmgen.calcremain -= opmcfg.calc1024; pcm += 2; @@ -147,3 +148,4 @@ void SOUNDCALL opmgen_getpcm(void *hdl, (void)hdl; } +#endif