Remove the bug introduced by a port of SDL_mixer to MacOS classic; see UQM bug #166

git-svn-id: svn://svn.code.sf.net/p/sc2/code/trunk@2223 8092fc87-c524-0410-9efc-e669fe64eaf9
This commit is contained in:
avolkov
2006-01-20 23:18:35 +00:00
parent 7ca9b81e16
commit 00af93d113
@@ -40,9 +40,6 @@
#include "mikmod_internals.h" #include "mikmod_internals.h"
#if defined(macintosh) || defined(__APPLE__)
#define NO_64BIT_MIXER
#endif
/* /*
Constant Definitions Constant Definitions
==================== ====================
@@ -266,8 +263,6 @@ static SLONG Mix32StereoSurround(SWORD* srce,SLONG* dest,SLONG index,SLONG incre
/*========== 64 bit mixers */ /*========== 64 bit mixers */
#ifndef NO_64BIT_MIXER
static SLONGLONG MixMonoNormal(SWORD* srce,SLONG* dest,SLONGLONG index,SLONGLONG increment,SLONG todo) static SLONGLONG MixMonoNormal(SWORD* srce,SLONG* dest,SLONGLONG index,SLONGLONG increment,SLONG todo)
{ {
SWORD sample=0; SWORD sample=0;
@@ -383,8 +378,6 @@ static SLONGLONG MixStereoSurround(SWORD* srce,SLONG* dest,SLONGLONG index,SLONG
return index; return index;
} }
#endif /* NO_64BIT_MIXER */
static void(*Mix32to16)(SWORD* dste,SLONG* srce,NATIVE count); static void(*Mix32to16)(SWORD* dste,SLONG* srce,NATIVE count);
static void(*Mix32to8)(SBYTE* dste,SLONG* srce,NATIVE count); static void(*Mix32to8)(SBYTE* dste,SLONG* srce,NATIVE count);
static void(*MixReverb)(SLONG* srce,NATIVE count); static void(*MixReverb)(SLONG* srce,NATIVE count);
@@ -649,9 +642,6 @@ static void AddChannel(SLONG* ptr,NATIVE todo)
(s,ptr,vnf->current,vnf->increment,done); (s,ptr,vnf->current,vnf->increment,done);
} else } else
#endif #endif
#ifdef NO_64BIT_MIXER
/* Uh oh, the 64-bit mixers don't compile... */;
#else
{ {
if(vc_mode & DMODE_STEREO) { if(vc_mode & DMODE_STEREO) {
if((vnf->pan==PAN_SURROUND)&&(vc_mode&DMODE_SURROUND)) if((vnf->pan==PAN_SURROUND)&&(vc_mode&DMODE_SURROUND))
@@ -664,7 +654,6 @@ static void AddChannel(SLONG* ptr,NATIVE todo)
vnf->current=MixMonoNormal vnf->current=MixMonoNormal
(s,ptr,vnf->current,vnf->increment,done); (s,ptr,vnf->current,vnf->increment,done);
} }
#endif
} else { } else {
vnf->lastvalL = vnf->lastvalR = 0; vnf->lastvalL = vnf->lastvalR = 0;
/* update sample position */ /* update sample position */