aboutsummaryrefslogtreecommitdiffstats
path: root/Alc/midi
diff options
context:
space:
mode:
authorChris Robinson <[email protected]>2014-01-03 18:48:47 -0800
committerChris Robinson <[email protected]>2014-01-03 18:52:17 -0800
commite6e7e461c092bb2aa3211910a6eadf1472c07f1d (patch)
tree867c50b66f3073a22c7cf882bf413ffc12fae783 /Alc/midi
parent5dc4ea15bbac289e3691bd48d19112519ab406ca (diff)
Avoid using alFontsoundiSOFT when loading a soundfont
This should now make the soundfont loader thread-safe.
Diffstat (limited to 'Alc/midi')
-rw-r--r--Alc/midi/sf2load.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/Alc/midi/sf2load.c b/Alc/midi/sf2load.c
index 169261d8..e662bd90 100644
--- a/Alc/midi/sf2load.c
+++ b/Alc/midi/sf2load.c
@@ -713,7 +713,7 @@ static ALboolean ensureZoneSanity(const GenModList *zone, int splidx)
return AL_TRUE;
}
-static void fillZone(ALfontsound *sound, const GenModList *zone)
+static void fillZone(ALfontsound *sound, ALCcontext *context, const GenModList *zone)
{
static const ALenum Gen2Param[60] = {
0, /* 0 - startAddrOffset */
@@ -833,7 +833,7 @@ static void fillZone(ALfontsound *sound, const GenModList *zone)
if(!(value == 0 || value == 1 || value == 3))
value = 0;
}
- alFontsoundiSOFT(sound->id, param, value);
+ ALfontsound_setPropi(sound, context, param, value);
}
else if(gen->mGenerator < 256)
{
@@ -944,7 +944,7 @@ static void processInstrument(ALfontsound ***sounds, ALsizei *sounds_size, ALCco
(*sounds)[*sounds_size]->PitchKey = samp->mOriginalKey;
(*sounds)[*sounds_size]->PitchCorrection = samp->mCorrection;
(*sounds)[*sounds_size]->LoopMode = (samp->mSampleType&0x7ffff);
- fillZone((*sounds)[*sounds_size], &lzone);
+ fillZone((*sounds)[*sounds_size], context, &lzone);
(*sounds_size)++;
break;