--- np2/macosx/soundmng.cpp 2003/11/13 18:17:42 1.6 +++ np2/macosx/soundmng.cpp 2003/11/14 07:37:29 1.7 @@ -20,7 +20,7 @@ typedef struct { UINT rate; UINT samples; UINT buffersize; -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) SINT16 *indata; SINT16 *extendbuffer; #endif @@ -46,7 +46,7 @@ static pascal void QSoundCallback(SndCha QSOUND qs; int nextbuf; void *dst; -#if !defined(SOUNDMNG_USEBUFFERING) +#if defined(SOUND_CRITICAL) const SINT32 *src; #endif @@ -54,7 +54,7 @@ const SINT32 *src; qs = &QSound; nextbuf = inCommand->param1; dst = qs->buf[nextbuf]->sampleArea; -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) if (qs->indata) { CopyMemory((SINT16 *)dst, qs->indata, qs->buffersize); qs->indata = NULL; @@ -138,7 +138,7 @@ static BOOL SoundBuffer_Init(UINT rate, drate = rate; dtox80(&drate, &extFreq); -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) qs->extendbuffer = (SINT16 *)_MALLOC(buffersize, "Extend buffer"); if (qs->extendbuffer == NULL) { goto sbinit_err; @@ -189,7 +189,7 @@ static void SoundBuffer_Term(void) { buf[i] = NULL; } } -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) qs->indata = NULL; if (qs->extendbuffer) { _MFREE(qs->extendbuffer); @@ -217,7 +217,7 @@ UINT soundmng_create(UINT rate, UINT ms) if (SoundChannel_Init()) { goto qsinit_err; } -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) samples = rate * ms / (SOUNDBUFFERS * 1000); samples = (samples + 3) & (~3); #else @@ -274,7 +274,7 @@ void soundmng_setreverse(BOOL reverse) { } } -#if defined(SOUNDMNG_USEBUFFERING) +#if !defined(SOUND_CRITICAL) void soundmng_sync(void) { QSOUND qs;