--- xmil/sound/sndctrl.c 2004/08/20 12:09:20 1.5 +++ xmil/sound/sndctrl.c 2005/02/04 06:42:12 1.6 @@ -1,12 +1,15 @@ #include "compiler.h" +#if !defined(DISABLE_SOUND) #include "soundmng.h" #include "pccore.h" #include "sound.h" #include "sndctrl.h" +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) OPMCH opmch[OPMCH_MAX]; _OPMGEN opmgen; +#endif _PSGGEN psggen; @@ -16,9 +19,11 @@ void sndctrl_initialize(void) { rate = xmilcfg.samplingrate; sound_create(rate, xmilcfg.delayms); +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) opmgen_initialize(rate); - psggen_initialize(rate); opmgen_setvol(xmilcfg.vol_fm); +#endif + psggen_initialize(rate); psggen_setvol(xmilcfg.vol_ssg); } @@ -30,10 +35,13 @@ void sndctrl_deinitialize(void) { void sndctrl_reset(void) { +#if defined(SUPPORT_TURBOZ) || defined(SUPPORT_OPM) opmgen_reset(); - psggen_reset(&psggen); - sound_streamregist(&opmgen, (SOUNDCB)opmgen_getpcm); +#endif + psggen_reset(&psggen); sound_streamregist(&psggen, (SOUNDCB)psggen_getpcm); } +#endif +