aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2019-10-02 15:37:33 -0700
committerChris Robinson <[email protected]>2019-10-02 15:37:33 -0700
commitd639935e1975db4276f6ee8c3622684cefa6b269 (patch)
tree6582ab4054fcbdae6eb9841f8ee3ded0356f9c7f
parenta35cac7ce0efcac1ffd4af41de8456eed99dba0e (diff)
Move a couple types to the source they're used in
-rw-r--r--alc/alu.h6
-rw-r--r--alc/voice.cpp7
2 files changed, 7 insertions, 6 deletions
diff --git a/alc/alu.h b/alc/alu.h
index 06be1a01..90a28654 100644
--- a/alc/alu.h
+++ b/alc/alu.h
@@ -317,12 +317,6 @@ using MixerFunc = void(*)(const al::span<const float> InSamples,
const size_t Counter, const size_t OutPos);
using RowMixerFunc = void(*)(const al::span<float> OutBuffer, const al::span<const float> Gains,
const float *InSamples, const size_t InStride);
-using HrtfMixerFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
- const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize,
- MixHrtfFilter *hrtfparams, const size_t BufferSize);
-using HrtfMixerBlendFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
- const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize,
- const HrtfFilter *oldparams, MixHrtfFilter *newparams, const size_t BufferSize);
using HrtfDirectMixerFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
const al::span<const FloatBufferLine> InSamples, float2 *AccumSamples, DirectHrtfState *State,
const size_t BufferSize);
diff --git a/alc/voice.cpp b/alc/voice.cpp
index d6be174e..a828e21f 100644
--- a/alc/voice.cpp
+++ b/alc/voice.cpp
@@ -74,6 +74,13 @@ RowMixerFunc MixRowSamples = MixRow_<CTag>;
namespace {
+using HrtfMixerFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
+ const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize,
+ MixHrtfFilter *hrtfparams, const size_t BufferSize);
+using HrtfMixerBlendFunc = void(*)(FloatBufferLine &LeftOut, FloatBufferLine &RightOut,
+ const ALfloat *InSamples, float2 *AccumSamples, const size_t OutPos, const ALuint IrSize,
+ const HrtfFilter *oldparams, MixHrtfFilter *newparams, const size_t BufferSize);
+
HrtfMixerFunc MixHrtfSamples = MixHrtf_<CTag>;
HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_<CTag>;