diff options
| -rw-r--r-- | Alc/effects/reverb.c | 2 | ||||
| -rw-r--r-- | Alc/mixer.c | 4 | ||||
| -rw-r--r-- | OpenAL32/Include/alu.h | 3 |
3 files changed, 4 insertions, 5 deletions
diff --git a/Alc/effects/reverb.c b/Alc/effects/reverb.c index ee7954c4..e86e3895 100644 --- a/Alc/effects/reverb.c +++ b/Alc/effects/reverb.c @@ -50,13 +50,11 @@ #define UNEXPECTED(x) (x) #endif -static MixerFunc MixSamples = Mix_C; static RowMixerFunc MixRowSamples = MixRow_C; static alonce_flag mixfunc_inited = AL_ONCE_FLAG_INIT; static void init_mixfunc(void) { - MixSamples = SelectMixer(); MixRowSamples = SelectRowMixer(); } diff --git a/Alc/mixer.c b/Alc/mixer.c index 1214169b..00d2c601 100644 --- a/Alc/mixer.c +++ b/Alc/mixer.c @@ -51,11 +51,11 @@ static_assert(MAX_POST_SAMPLES >= 12, "MAX_POST_SAMPLES must be at least 12!"); enum Resampler ResamplerDefault = LinearResampler; -static MixerFunc MixSamples = Mix_C; +MixerFunc MixSamples = Mix_C; static HrtfMixerFunc MixHrtfSamples = MixHrtf_C; HrtfMixerBlendFunc MixHrtfBlendSamples = MixHrtfBlend_C; -MixerFunc SelectMixer(void) +static MixerFunc SelectMixer(void) { #ifdef HAVE_NEON if((CPUCapFlags&CPU_CAP_NEON)) diff --git a/OpenAL32/Include/alu.h b/OpenAL32/Include/alu.h index 049a9dcd..625da0dc 100644 --- a/OpenAL32/Include/alu.h +++ b/OpenAL32/Include/alu.h @@ -412,7 +412,6 @@ void aluInit(void); void aluInitMixer(void); -MixerFunc SelectMixer(void); RowMixerFunc SelectRowMixer(void); ResamplerFunc SelectResampler(enum Resampler resampler); @@ -515,6 +514,8 @@ void aluHandleDisconnect(ALCdevice *device); void UpdateContextProps(ALCcontext *context); +extern MixerFunc MixSamples; + extern ALfloat ConeScale; extern ALfloat ZScale; extern ALboolean OverrideReverbSpeedOfSound; |