diff options
author | Chris Robinson <[email protected]> | 2014-03-22 02:39:57 -0700 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2014-03-22 02:39:57 -0700 |
commit | 842aeb888b79883a08c672ed12f1f2b87a0fb46e (patch) | |
tree | 8bb3b91961d51f4a82ee1520d1ffc48ed8b7b379 /OpenAL32/Include/alSource.h | |
parent | 22f6eb18a24c91e0e8a9c060de5690533e075429 (diff) |
Move some HRTF and mixer structs to alu.h
Diffstat (limited to 'OpenAL32/Include/alSource.h')
-rw-r--r-- | OpenAL32/Include/alSource.h | 57 |
1 files changed, 0 insertions, 57 deletions
diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 0cc72d27..3d3f3029 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -5,18 +5,12 @@ #include "alMain.h" #include "alu.h" -#include "alFilter.h" -#include "alBuffer.h" #include "hrtf.h" #ifdef __cplusplus extern "C" { #endif -#define SRC_HISTORY_BITS (6) -#define SRC_HISTORY_LENGTH (1<<SRC_HISTORY_BITS) -#define SRC_HISTORY_MASK (SRC_HISTORY_LENGTH-1) - extern enum Resampler DefaultResampler; extern const ALsizei ResamplerPadding[ResamplerMax]; @@ -30,57 +24,6 @@ typedef struct ALbufferlistitem { } ALbufferlistitem; -typedef struct HrtfState { - ALboolean Moving; - ALuint Counter; - ALIGN(16) ALfloat History[MAX_INPUT_CHANNELS][SRC_HISTORY_LENGTH]; - ALIGN(16) ALfloat Values[MAX_INPUT_CHANNELS][HRIR_LENGTH][2]; - ALuint Offset; -} HrtfState; - -typedef struct HrtfParams { - ALfloat Gain; - ALfloat Dir[3]; - ALIGN(16) ALfloat Coeffs[MAX_INPUT_CHANNELS][HRIR_LENGTH][2]; - ALIGN(16) ALfloat CoeffStep[HRIR_LENGTH][2]; - ALuint Delay[MAX_INPUT_CHANNELS][2]; - ALint DelayStep[2]; - ALuint IrSize; -} HrtfParams; - -typedef struct DirectParams { - ALfloat (*OutBuffer)[BUFFERSIZE]; - ALfloat *ClickRemoval; - ALfloat *PendingClicks; - - union { - struct { - HrtfParams Params; - HrtfState *State; - } Hrtf; - - /* A mixing matrix. First subscript is the channel number of the input - * data (regardless of channel configuration) and the second is the - * channel target (eg. FrontLeft). Not used with HRTF. */ - ALfloat Gains[MAX_INPUT_CHANNELS][MaxChannels]; - } Mix; - - ALfilterState LpFilter[MAX_INPUT_CHANNELS]; -} DirectParams; - -typedef struct SendParams { - ALfloat (*OutBuffer)[BUFFERSIZE]; - ALfloat *ClickRemoval; - ALfloat *PendingClicks; - - /* Gain control, which applies to all input channels to a single (mono) - * output buffer. */ - ALfloat Gain; - - ALfilterState LpFilter[MAX_INPUT_CHANNELS]; -} SendParams; - - typedef struct ALactivesource { struct ALsource *Source; |