aboutsummaryrefslogtreecommitdiffstats
path: root/Alc
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2010-11-25 13:22:54 -0800
committerChris Robinson <[email protected]>2010-11-25 13:22:54 -0800
commit2c96c299386ae75003c0fce12c6c5935604412e2 (patch)
treeac42693293de5cbe800232c986fec0d037067d31 /Alc
parent65919b70370886cd70934f555d6e35b04b8714c8 (diff)
Rename some "template" functions
Diffstat (limited to 'Alc')
-rw-r--r--Alc/mixer.c42
1 files changed, 21 insertions, 21 deletions
diff --git a/Alc/mixer.c b/Alc/mixer.c
index 26c7f8de..92c54e46 100644
--- a/Alc/mixer.c
+++ b/Alc/mixer.c
@@ -90,7 +90,7 @@ static __inline ALfloat cos_lerp8(ALfloat val1, ALfloat val2, ALint frac)
#define DECL_MIX_MONO(T,sampler) \
-static void MixMono_##T##_##sampler(ALsource *Source, ALCdevice *Device, \
+static void Mix_##T##_Mono_##sampler(ALsource *Source, ALCdevice *Device, \
const T *data, ALuint *DataPosInt, ALuint *DataPosFrac, \
ALuint j, ALuint SamplesToDo, ALuint BufferSize) \
{ \
@@ -235,7 +235,7 @@ DECL_MIX_MONO(ALubyte, cos_lerp8)
#define DECL_MIX_STEREO(T,sampler) \
-static void MixStereo_##T##_##sampler(ALsource *Source, ALCdevice *Device, \
+static void Mix_##T##_Stereo_##sampler(ALsource *Source, ALCdevice *Device, \
const T *data, ALuint *DataPosInt, ALuint *DataPosFrac, \
ALuint j, ALuint SamplesToDo, ALuint BufferSize) \
{ \
@@ -392,7 +392,7 @@ DECL_MIX_STEREO(ALubyte, cos_lerp8)
#define DECL_MIX_MC(T,chans,sampler) \
-static void MixMC_##T##_##chans##_##sampler(ALsource *Source, ALCdevice *Device,\
+static void Mix_##T##_##chans##_##sampler(ALsource *Source, ALCdevice *Device,\
const T *data, ALuint *DataPosInt, ALuint *DataPosFrac, \
ALuint j, ALuint SamplesToDo, ALuint BufferSize) \
{ \
@@ -597,34 +597,34 @@ static void Mix_##T##_##sampler(ALsource *Source, ALCdevice *Device, ALuint Chan
switch(Channels) \
{ \
case 1: /* Mono */ \
- MixMono_##T##_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_Mono_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
case 2: /* Stereo */ \
- MixStereo_##T##_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_Stereo_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
case 4: /* Quad */ \
- MixMC_##T##_QuadChans_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_QuadChans_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
case 6: /* 5.1 */ \
- MixMC_##T##_X51Chans_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_X51Chans_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
case 7: /* 6.1 */ \
- MixMC_##T##_X61Chans_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_X61Chans_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
case 8: /* 7.1 */ \
- MixMC_##T##_X71Chans_##sampler(Source, Device, \
- Data, DataPosInt, DataPosFrac, \
- j, SamplesToDo, BufferSize); \
+ Mix_##T##_X71Chans_##sampler(Source, Device, \
+ Data, DataPosInt, DataPosFrac, \
+ j, SamplesToDo, BufferSize); \
break; \
} \
}