diff options
| author | Chris Robinson <[email protected]> | 2013-12-19 00:57:07 -0800 |
|---|---|---|
| committer | Chris Robinson <[email protected]> | 2013-12-19 00:57:07 -0800 |
| commit | 99933fac4940303903fcf4fbb022f48824196ed9 (patch) | |
| tree | 8d7e345003f87f34e5990c7127240e2f6a638ea3 /OpenAL32/Include | |
| parent | 57491bf14c43de01ffcbcd61d6bdff6df49f4066 (diff) | |
Allow creating instrument objects
Diffstat (limited to 'OpenAL32/Include')
| -rw-r--r-- | OpenAL32/Include/alMain.h | 9 | ||||
| -rw-r--r-- | OpenAL32/Include/alMidi.h | 8 |
2 files changed, 17 insertions, 0 deletions
diff --git a/OpenAL32/Include/alMain.h b/OpenAL32/Include/alMain.h index 70068f37..ce229c73 100644 --- a/OpenAL32/Include/alMain.h +++ b/OpenAL32/Include/alMain.h @@ -44,6 +44,9 @@ typedef ALboolean (AL_APIENTRY*LPALISSOUNDFONTSOFT)(ALuint id); typedef void (AL_APIENTRY*LPALGENPRESETSSOFT)(ALsizei n, ALuint *ids); typedef void (AL_APIENTRY*LPALDELETEPRESETSSOFT)(ALsizei n, const ALuint *ids); typedef ALboolean (AL_APIENTRY*LPALISPRESETSOFT)(ALuint id); +typedef void (AL_APIENTRY*LPALGENINSTRUMENTSSOFT)(ALsizei n, ALuint *ids); +typedef void (AL_APIENTRY*LPALDELETEINSTRUMENTSSOFT)(ALsizei n, const ALuint *ids); +typedef ALboolean (AL_APIENTRY*LPALISINSTRUMENTSOFT)(ALuint id); typedef void (AL_APIENTRY*LPALMIDISOUNDFONTSOFT)(const char *filename); typedef void (AL_APIENTRY*LPALMIDIEVENTSOFT)(ALuint64SOFT time, ALenum event, ALsizei channel, ALsizei param1, ALsizei param2); typedef void (AL_APIENTRY*LPALMIDISYSEXSOFT)(ALuint64SOFT time, const ALbyte *data, ALsizei size); @@ -61,6 +64,9 @@ AL_API ALboolean AL_APIENTRY alIsSoundfontSOFT(ALuint id); AL_API void AL_APIENTRY alGenPresetsSOFT(ALsizei n, ALuint *ids); AL_API void AL_APIENTRY alDeletePresetsSOFT(ALsizei n, const ALuint *ids); AL_API ALboolean AL_APIENTRY alIsPresetSOFT(ALuint id); +AL_API void AL_APIENTRY alGenInstrumentsSOFT(ALsizei n, ALuint *ids); +AL_API void AL_APIENTRY alDeleteInstrumentsSOFT(ALsizei n, const ALuint *ids); +AL_API ALboolean AL_APIENTRY alIsInstrumentSOFT(ALuint id); AL_API void AL_APIENTRY alMidiSoundfontSOFT(const char *filename); AL_API void AL_APIENTRY alMidiEventSOFT(ALuint64SOFT time, ALenum event, ALsizei channel, ALsizei param1, ALsizei param2); AL_API void AL_APIENTRY alMidiSysExSOFT(ALuint64SOFT time, const ALbyte *data, ALsizei size); @@ -440,6 +446,9 @@ struct ALCdevice_struct // Map of Presets for this device UIntMap PresetMap; + // Map of Instruments for this device + UIntMap InstrumentMap; + /* MIDI synth engine */ struct MidiSynth *Synth; diff --git a/OpenAL32/Include/alMidi.h b/OpenAL32/Include/alMidi.h index c2ddd728..b6835649 100644 --- a/OpenAL32/Include/alMidi.h +++ b/OpenAL32/Include/alMidi.h @@ -76,6 +76,14 @@ void ALsfinstrument_Construct(ALsfinstrument *self); void ALsfinstrument_Destruct(ALsfinstrument *self); +inline struct ALsfinstrument *LookupInstrument(ALCdevice *device, ALuint id) +{ return (struct ALsfinstrument*)LookupUIntMapKey(&device->InstrumentMap, id); } +inline struct ALsfinstrument *RemoveInstrument(ALCdevice *device, ALuint id) +{ return (struct ALsfinstrument*)RemoveUIntMapKey(&device->InstrumentMap, id); } + +void ReleaseALInstruments(ALCdevice *device); + + typedef struct ALsfpreset { volatile RefCount ref; |