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

Remove an unneeded MidiSynth field

Browse Source
This commit is contained in:
Chris Robinson 2013-11-28 05:06:40 -08:00
parent f8c68291d3
commit 8615a109ce
2 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
OpenAL32/Include/alMidi.h
View File

@ -18,7 +18,6 @@ typedef struct MidiSynth {
ALdouble SamplesSinceLast;
ALdouble SamplesToNext;
ALuint SampleRate;
ALdouble SamplesPerTick;
/* NOTE: This rwlock is for the state and soundfont. The EventQueue and

17
OpenAL32/alMidi.c
View File

@ -22,8 +22,8 @@ static inline void MidiSynth_setState(MidiSynth *self, ALenum state);
static inline void MidiSynth_reset(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);
static inline void MidiSynth_update(MidiSynth *self, ALCdevice *device);
static void MidiSynth_setSampleRate(MidiSynth *self, ALdouble srate);
static ALenum MidiSynth_insertEvent(MidiSynth *self, ALuint64 time, ALuint event, ALsizei param1, ALsizei param2);
@ -40,9 +40,7 @@ static void MidiSynth_Construct(MidiSynth *self, ALCdevice *device)
self->SamplesSinceLast = 0.0;
self->SamplesToNext = 0.0;
self->SampleRate = device->Frequency;
self->SamplesPerTick = (ALdouble)self->SampleRate / TICKS_PER_SECOND;
MidiSynth_updateSpeed(self);
self->SamplesPerTick = (ALdouble)device->Frequency / TICKS_PER_SECOND;
}
static void MidiSynth_Destruct(MidiSynth *self)
@ -78,15 +76,14 @@ static inline ALuint64 MidiSynth_getNextEvtTime(const MidiSynth *self)
return self->EventQueue.events[self->EventQueue.pos].time;
}
static void MidiSynth_update(MidiSynth *self, ALCdevice *device)
static inline void MidiSynth_update(MidiSynth *self, ALCdevice *device)
{
self->SampleRate = device->Frequency;
MidiSynth_updateSpeed(self);
MidiSynth_setSampleRate(self, device->Frequency);
}
static void MidiSynth_updateSpeed(MidiSynth *self)
static void MidiSynth_setSampleRate(MidiSynth *self, ALdouble srate)
{
ALdouble sampletickrate = (ALdouble)self->SampleRate / TICKS_PER_SECOND;
ALdouble sampletickrate = srate / TICKS_PER_SECOND;
self->SamplesSinceLast = self->SamplesSinceLast * sampletickrate / self->SamplesPerTick;
self->SamplesToNext = self->SamplesToNext * sampletickrate / self->SamplesPerTick;