diff options
| -rw-r--r-- | OpenAL32/Include/alMidi.h | 5 | ||||
| -rw-r--r-- | OpenAL32/alFontsound.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/OpenAL32/Include/alMidi.h b/OpenAL32/Include/alMidi.h index 948fc319..082e16d1 100644 --- a/OpenAL32/Include/alMidi.h +++ b/OpenAL32/Include/alMidi.h @@ -103,11 +103,6 @@ inline struct ALfontsound *LookupFontsound(ALCdevice *device, ALuint id) inline struct ALfontsound *RemoveFontsound(ALCdevice *device, ALuint id) { return (struct ALfontsound*)RemoveUIntMapKey(&device->FontsoundMap, id); } -inline struct ALsfmodulator *LookupModulator(ALfontsound *sound, ALuint id) -{ return (struct ALsfmodulator*)LookupUIntMapKey(&sound->ModulatorMap, id); } -inline struct ALsfmodulator *RemoveModulator(ALfontsound *sound, ALuint id) -{ return (struct ALsfmodulator*)RemoveUIntMapKey(&sound->ModulatorMap, id); } - void ReleaseALFontsounds(ALCdevice *device); diff --git a/OpenAL32/alFontsound.c b/OpenAL32/alFontsound.c index 64c2a227..aaa65c98 100644 --- a/OpenAL32/alFontsound.c +++ b/OpenAL32/alFontsound.c @@ -15,8 +15,7 @@ extern inline struct ALfontsound *LookupFontsound(ALCdevice *device, ALuint id); extern inline struct ALfontsound *RemoveFontsound(ALCdevice *device, ALuint id); -extern inline struct ALsfmodulator *LookupModulator(ALfontsound *sound, ALuint id); -extern inline struct ALsfmodulator *RemoveModulator(ALfontsound *sound, ALuint id); + static void ALfontsound_Construct(ALfontsound *self); static void ALfontsound_Destruct(ALfontsound *self); @@ -25,6 +24,11 @@ static ALsfmodulator *ALfontsound_getModStage(ALfontsound *self, ALsizei stage); void ALfontsound_setModStagei(ALfontsound *self, ALCcontext *context, ALsizei stage, ALenum param, ALint value); static void ALfontsound_getModStagei(ALfontsound *self, ALCcontext *context, ALsizei stage, ALenum param, ALint *values); +static inline struct ALsfmodulator *LookupModulator(ALfontsound *sound, ALuint id) +{ return (struct ALsfmodulator*)LookupUIntMapKey(&sound->ModulatorMap, id); } +static inline struct ALsfmodulator *RemoveModulator(ALfontsound *sound, ALuint id) +{ return (struct ALsfmodulator*)RemoveUIntMapKey(&sound->ModulatorMap, id); } + AL_API void AL_APIENTRY alGenFontsoundsSOFT(ALsizei n, ALuint *ids) { |