zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2024-11-27 06:22:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

Use a runtime check to detect version of libinstpatch (#666)

Browse source 
It could be that during runtime an older version of libinstpatch is used than the one fluidsynth was compiled against. In this case, libinstpatch will fail to load DLS fonts, because libinstpatch's initialization semantics don't match those compiled into fluidsynth.
This commit is contained in:
Tom M 2020-08-31 20:35:21 +02:00 committed by GitHub
parent 0cccf83a38
commit aea6644324
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 26 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/sfloader/fluid_instpatch.c
View file

@ -44,6 +44,15 @@ enum
MAX_INST_VOICES = 128,
};
int fluid_instpatch_supports_multi_init(void)
{
guint major, minor, patch;
ipatch_version(&major, &minor, &patch);
/* libinstpatch <= 1.1.4 only supports calling ipatch_init() once */
return FLUID_VERSION_CHECK(major, minor, patch) > FLUID_VERSION_CHECK(1, 1, 4);
}
void fluid_instpatch_init(void)
{
ipatch_init();

2
src/sfloader/fluid_instpatch.h
View file

@ -9,4 +9,6 @@ void fluid_instpatch_init(void);
void fluid_instpatch_deinit(void);
fluid_sfloader_t *new_fluid_instpatch_loader(fluid_settings_t *settings);
int fluid_instpatch_supports_multi_init(void);
#endif // _FLUID_INSTPATCH_H

21
src/synth/fluid_synth.c
View file

@ -464,11 +464,12 @@ fluid_synth_init(void)
/* Amount: 96 dB of attenuation (on the opposite channel) */
fluid_mod_set_amount(&custom_balance_mod, FLUID_PEAK_ATTENUATION); /* Amount: 960 */
/* libinstpatch <= 1.1.4 only supports calling init() once */
#if defined(LIBINSTPATCH_SUPPORT) && \
FLUID_VERSION_CHECK(IPATCH_VERSION_MAJOR,IPATCH_VERSION_MINOR,IPATCH_VERSION_PATCH) <= FLUID_VERSION_CHECK(1,1,4)
#if defined(LIBINSTPATCH_SUPPORT)
/* defer libinstpatch init to fluid_instpatch.c to avoid #include "libinstpatch.h" */
if(!fluid_instpatch_supports_multi_init())
{
fluid_instpatch_init();
}
#endif
}
@ -628,10 +629,11 @@ new_fluid_synth(fluid_settings_t *settings)
FLUID_MEMSET(synth, 0, sizeof(fluid_synth_t));
#if defined(LIBINSTPATCH_SUPPORT) && \
FLUID_VERSION_CHECK(IPATCH_VERSION_MAJOR,IPATCH_VERSION_MINOR,IPATCH_VERSION_PATCH) > FLUID_VERSION_CHECK(1,1,4)
/* defer libinstpatch init to fluid_instpatch.c to avoid #include "libinstpatch.h" */
#if defined(LIBINSTPATCH_SUPPORT)
if(fluid_instpatch_supports_multi_init())
{
fluid_instpatch_init();
}
#endif
fluid_rec_mutex_init(synth->mutex);
@ -1125,10 +1127,11 @@ delete_fluid_synth(fluid_synth_t *synth)
FLUID_FREE(synth);
#if defined(LIBINSTPATCH_SUPPORT) && \
FLUID_VERSION_CHECK(IPATCH_VERSION_MAJOR,IPATCH_VERSION_MINOR,IPATCH_VERSION_PATCH) > FLUID_VERSION_CHECK(1,1,4)
/* defer libinstpatch deinit to fluid_instpatch.c to avoid #include "libinstpatch.h" */
#if defined(LIBINSTPATCH_SUPPORT)
if(fluid_instpatch_supports_multi_init())
{
fluid_instpatch_deinit();
}
#endif
}