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

Cleanups for MidiSynth

Browse Source 
Remove an unneeded field, make MidiSynth_getTime public, and properly return a
64-bit time from it.
This commit is contained in:
Chris Robinson
2013-11-27 19:41:52 -08:00
parent 182b08d8bc
commit 489723723c
2 changed files with 5 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenAL32/Include/alMidi.h
+2 -2
View File
@@ -23,11 +23,11 @@ typedef struct MidiSynth {
volatile ALenum State;
char *FontName;
const struct MidiSynthVtable *vtbl;
} MidiSynth;
ALuint64 MidiSynth_getTime(const MidiSynth *self);
struct MidiSynthVtable {
void (*const Destruct)(MidiSynth *self);
OpenAL32/alMidi.c
+3 -8
View File
@@ -19,7 +19,7 @@
static void MidiSynth_Construct(MidiSynth *self, ALCdevice *device);
static void MidiSynth_Destruct(MidiSynth *self);
static inline void MidiSynth_setState(MidiSynth *self, ALenum state);
static inline ALuint MidiSynth_getTime(const MidiSynth *self);
ALuint64 MidiSynth_getTime(const MidiSynth *self);
static inline ALuint64 MidiSynth_getNextEvtTime(const MidiSynth *self);
static void MidiSynth_update(MidiSynth *self, ALCdevice *device);
static void MidiSynth_updateSpeed(MidiSynth *self);
@@ -37,8 +37,6 @@ static void MidiSynth_Construct(MidiSynth *self, ALCdevice *device)
self->State = AL_INITIAL;
self->FontName = NULL;
self->SampleRate = device->Frequency;
self->SamplesPerTick = (ALdouble)self->SampleRate / TICKS_PER_SECOND;
MidiSynth_updateSpeed(self);
@@ -46,9 +44,6 @@ static void MidiSynth_Construct(MidiSynth *self, ALCdevice *device)
static void MidiSynth_Destruct(MidiSynth *self)
{
free(self->FontName);
self->FontName = NULL;
ResetEvtQueue(&self->EventQueue);
}
@@ -57,9 +52,9 @@ static inline void MidiSynth_setState(MidiSynth *self, ALenum state)
ExchangeInt(&self->State, state);
}
static inline ALuint MidiSynth_getTime(const MidiSynth *self)
ALuint64 MidiSynth_getTime(const MidiSynth *self)
{
ALuint time = self->LastEvtTime + (self->SamplesSinceLast/self->SamplesPerTick);
ALuint64 time = self->LastEvtTime + (self->SamplesSinceLast/self->SamplesPerTick);
return clampu(time, self->LastEvtTime, self->NextEvtTime);
}