diff options
| author | Chris Robinson <[email protected]> | 2014-03-23 03:03:03 -0700 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2014-03-23 03:03:03 -0700 |
| commit | 0ce0a88fd67ddcf7cb5248ac08d36cfa1c0013eb (patch) | |
| tree | 97529b194e1ae3c33b7d4faa605ee3ead4e350d2 /OpenAL32 | |
| parent | b0d511a8609cd2f3c10fd5b65603211a14c8141e (diff) | |
Move the step counter and moving flag to DirectParams
Diffstat (limited to 'OpenAL32')
| -rw-r--r-- | OpenAL32/Include/alu.h | 6 | ||||
| -rw-r--r-- | OpenAL32/alSource.c | 4 |
2 files changed, 6 insertions, 4 deletions
diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index c4baed83..3ec16565 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -38,8 +38,6 @@ extern "C" { #endif 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; @@ -71,6 +69,10 @@ typedef struct DirectParams { * channel target (eg. FrontLeft). Not used with HRTF. */ ALfloat Gains[MAX_INPUT_CHANNELS][MaxChannels]; } Mix; + /* If not 'moving', gain/coefficients are set directly without fading. */ + ALboolean Moving; + /* Stepping counter for gain/coefficient fading. */ + ALuint Counter; ALfilterState LpFilter[MAX_INPUT_CHANNELS]; } DirectParams; diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index e12c9b35..082d8f54 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -2339,8 +2339,8 @@ ALvoid SetSourceState(ALsource *Source, ALCcontext *Context, ALenum state) } else { - src->Direct.Mix.Hrtf.State.Moving = AL_FALSE; - src->Direct.Mix.Hrtf.State.Counter = 0; + src->Direct.Moving = AL_FALSE; + src->Direct.Counter = 0; for(j = 0;j < MAX_INPUT_CHANNELS;j++) { for(k = 0;k < SRC_HISTORY_LENGTH;k++) |