diff options
author | Chris Robinson <[email protected]> | 2010-11-28 17:37:14 -0800 |
---|---|---|
committer | Chris Robinson <[email protected]> | 2010-11-28 17:37:14 -0800 |
commit | f09ae196a83c8a64fdd29e60b30dc51a367cb1c9 (patch) | |
tree | 6175c49d6a1a7a8ebd65acb2c1e89e2750c027d1 | |
parent | 3e702ae2bca0e4536f55aaffaa61674da0108025 (diff) |
Avoid making Resampler[Pre]Padding static
-rw-r--r-- | Alc/ALc.c | 3 | ||||
-rw-r--r-- | OpenAL32/Include/alSource.h | 13 | ||||
-rw-r--r-- | OpenAL32/alSource.c | 14 |
3 files changed, 17 insertions, 13 deletions
@@ -366,9 +366,6 @@ static const ALchar alExtList[] = // Mixing Priority Level static ALint RTPrioLevel; -// Resampler Quality -resampler_t DefaultResampler; - // Output Log File static FILE *LogFile; diff --git a/OpenAL32/Include/alSource.h b/OpenAL32/Include/alSource.h index 93f5eda1..154c9cfe 100644 --- a/OpenAL32/Include/alSource.h +++ b/OpenAL32/Include/alSource.h @@ -22,16 +22,9 @@ typedef enum { } resampler_t; extern resampler_t DefaultResampler; -static const ALsizei ResamplerPadding[RESAMPLER_MAX] = { - 0, /* Point */ - 1, /* Linear */ - 2, /* Cubic */ -}; -static const ALsizei ResamplerPrePadding[RESAMPLER_MAX] = { - 0, /* Point */ - 0, /* Linear */ - 1, /* Cubic */ -}; +extern const ALsizei ResamplerPadding[RESAMPLER_MAX]; +extern const ALsizei ResamplerPrePadding[RESAMPLER_MAX]; + typedef struct ALbufferlistitem { diff --git a/OpenAL32/alSource.c b/OpenAL32/alSource.c index fd258872..db975eb5 100644 --- a/OpenAL32/alSource.c +++ b/OpenAL32/alSource.c @@ -32,6 +32,20 @@ #include "alThunk.h" #include "alAuxEffectSlot.h" + +resampler_t DefaultResampler; +const ALsizei ResamplerPadding[RESAMPLER_MAX] = { + 0, /* Point */ + 1, /* Linear */ + 2, /* Cubic */ +}; +const ALsizei ResamplerPrePadding[RESAMPLER_MAX] = { + 0, /* Point */ + 0, /* Linear */ + 1, /* Cubic */ +}; + + static ALvoid InitSourceParams(ALsource *Source); static ALvoid GetSourceOffset(ALsource *Source, ALenum eName, ALdouble *Offsets, ALdouble updateLen); static ALboolean ApplyOffset(ALsource *Source); |