diff options
| -rw-r--r-- | Alc/midi/base.h | 6 | ||||
| -rw-r--r-- | OpenAL32/Include/alMidi.h | 98 |
2 files changed, 3 insertions, 101 deletions
diff --git a/Alc/midi/base.h b/Alc/midi/base.h index bba24baa..4f10b89b 100644 --- a/Alc/midi/base.h +++ b/Alc/midi/base.h @@ -1,5 +1,5 @@ -#ifndef ALMIDI_H -#define ALMIDI_H +#ifndef AL_MIDI_BASE_H +#define AL_MIDI_BASE_H #include "alMain.h" #include "atomic.h" @@ -110,4 +110,4 @@ MidiSynth *SynthCreate(ALCdevice *device); } #endif -#endif /* ALMIDI_H */ +#endif /* AL_MIDI_BASE_H */ diff --git a/OpenAL32/Include/alMidi.h b/OpenAL32/Include/alMidi.h index bba24baa..e03cad13 100644 --- a/OpenAL32/Include/alMidi.h +++ b/OpenAL32/Include/alMidi.h @@ -3,109 +3,11 @@ #include "alMain.h" #include "atomic.h" -#include "evtqueue.h" #ifdef __cplusplus extern "C" { #endif -struct MidiSynthVtable; - -typedef struct MidiSynth { - EvtQueue EventQueue; - - ALuint64 LastEvtTime; - ALuint64 NextEvtTime; - ALdouble SamplesSinceLast; - ALdouble SamplesToNext; - - ALdouble SamplesPerTick; - - /* NOTE: This rwlock is for the state and soundfont. The EventQueue and - * related must instead use the device lock as they're used in the mixer - * thread. - */ - RWLock Lock; - - volatile ALfloat Gain; - volatile ALenum State; - - const struct MidiSynthVtable *vtbl; -} MidiSynth; - -void MidiSynth_Construct(MidiSynth *self, ALCdevice *device); -void MidiSynth_Destruct(MidiSynth *self); -const char *MidiSynth_getFontName(const MidiSynth *self, const char *filename); -inline void MidiSynth_setGain(MidiSynth *self, ALfloat gain) { self->Gain = gain; } -inline ALfloat MidiSynth_getGain(const MidiSynth *self) { return self->Gain; } -inline void MidiSynth_setState(MidiSynth *self, ALenum state) { ExchangeInt(&self->State, state); } -void MidiSynth_stop(MidiSynth *self); -inline void MidiSynth_reset(MidiSynth *self) { MidiSynth_stop(self); } -ALuint64 MidiSynth_getTime(const MidiSynth *self); -inline ALuint64 MidiSynth_getNextEvtTime(const MidiSynth *self) -{ - if(self->EventQueue.pos == self->EventQueue.size) - return UINT64_MAX; - return self->EventQueue.events[self->EventQueue.pos].time; -} -void MidiSynth_setSampleRate(MidiSynth *self, ALdouble srate); -inline void MidiSynth_update(MidiSynth *self, ALCdevice *device) -{ MidiSynth_setSampleRate(self, device->Frequency); } -ALenum MidiSynth_insertEvent(MidiSynth *self, ALuint64 time, ALuint event, ALsizei param1, ALsizei param2); -ALenum MidiSynth_insertSysExEvent(MidiSynth *self, ALuint64 time, const ALbyte *data, ALsizei size); - - -struct MidiSynthVtable { - void (*const Destruct)(MidiSynth *self); - - ALboolean (*const isSoundfont)(MidiSynth *self, const char *filename); - ALenum (*const loadSoundfont)(MidiSynth *self, const char *filename); - - void (*const setGain)(MidiSynth *self, ALfloat gain); - void (*const setState)(MidiSynth *self, ALenum state); - - void (*const stop)(MidiSynth *self); - void (*const reset)(MidiSynth *self); - - void (*const update)(MidiSynth *self, ALCdevice *device); - void (*const process)(MidiSynth *self, ALuint samples, ALfloat (*restrict DryBuffer)[BUFFERSIZE]); - - void (*const Delete)(MidiSynth *self); -}; - -#define DEFINE_MIDISYNTH_VTABLE(T) \ -DECLARE_THUNK(T, MidiSynth, void, Destruct) \ -DECLARE_THUNK1(T, MidiSynth, ALboolean, isSoundfont, const char*) \ -DECLARE_THUNK1(T, MidiSynth, ALenum, loadSoundfont, const char*) \ -DECLARE_THUNK1(T, MidiSynth, void, setGain, ALfloat) \ -DECLARE_THUNK1(T, MidiSynth, void, setState, ALenum) \ -DECLARE_THUNK(T, MidiSynth, void, stop) \ -DECLARE_THUNK(T, MidiSynth, void, reset) \ -DECLARE_THUNK1(T, MidiSynth, void, update, ALCdevice*) \ -DECLARE_THUNK2(T, MidiSynth, void, process, ALuint, ALfloatBUFFERSIZE*restrict) \ -DECLARE_THUNK(T, MidiSynth, void, Delete) \ - \ -static const struct MidiSynthVtable T##_MidiSynth_vtable = { \ - T##_MidiSynth_Destruct, \ - \ - T##_MidiSynth_isSoundfont, \ - T##_MidiSynth_loadSoundfont, \ - T##_MidiSynth_setGain, \ - T##_MidiSynth_setState, \ - T##_MidiSynth_stop, \ - T##_MidiSynth_reset, \ - T##_MidiSynth_update, \ - T##_MidiSynth_process, \ - \ - T##_MidiSynth_Delete, \ -} - - -MidiSynth *FSynth_create(ALCdevice *device); -MidiSynth *DSynth_create(ALCdevice *device); - -MidiSynth *SynthCreate(ALCdevice *device); - #ifdef __cplusplus } #endif |