From d639935e1975db4276f6ee8c3622684cefa6b269 Mon Sep 17 00:00:00 2001 From: Chris Robinson Date: Wed, 2 Oct 2019 15:37:33 -0700 Subject: Move a couple types to the source they're used in --- alc/alu.h | 6 ------ alc/voice.cpp | 7 +++++++ 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'alc') 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 InSamples, const size_t Counter, const size_t OutPos); using RowMixerFunc = void(*)(const al::span OutBuffer, const al::span 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 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_; 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_; HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_; -- cgit v1.2.3