kcat/openal-soft
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Make MixSamples non-static global

Browse Source
This commit is contained in:
Chris Robinson 2017-12-17 21:48:07 -08:00
parent 8253014fe9
commit 2346426b6e
3 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Alc/effects/reverb.c
View File

@ -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();
}

4
Alc/mixer.c
View File

@ -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))

3
OpenAL32/Include/alu.h
View File

@ -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;