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

Make fluid_is_soundfont() DLS aware

Browse source
This commit is contained in:
derselbst 2019-10-31 08:47:14 +01:00
parent d4b3a08f53
commit f7eb9e0c17
2 changed files with 27 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
src/fluidsynth.c
View file

@ -302,23 +302,6 @@ fast_render_loop(fluid_settings_t *settings, fluid_synth_t *synth, fluid_player_
delete_fluid_file_renderer(renderer); delete_fluid_file_renderer(renderer);
} }
static int is_dls(const char *fname)
{
#ifdef LIBINSTPATCH_SUPPORT
IpatchFileHandle *fhandle = ipatch_file_identify_open(fname, NULL);
int ret = (fhandle != NULL);
if(ret)
{
ipatch_file_close(fhandle);
}
return ret;
#else
return FALSE;
#endif
}
/* /*
* main * main
* Process initialization steps in the following order: * Process initialization steps in the following order:
@ -822,7 +805,7 @@ int main(int argc, char **argv)
/* load the soundfonts (check that all non options are SoundFont or MIDI files) */ /* load the soundfonts (check that all non options are SoundFont or MIDI files) */
for(i = arg1; i < argc; i++) for(i = arg1; i < argc; i++)
{ {
if(fluid_is_soundfont(argv[i]) || is_dls(argv[i])) if(fluid_is_soundfont(argv[i]))
{ {
if(fluid_synth_sfload(synth, argv[i], 1) == -1) if(fluid_synth_sfload(synth, argv[i], 1) == -1)
{ {

31
src/sfloader/fluid_sffile.c
View file

@ -30,6 +30,10 @@
#include <sndfile.h> #include <sndfile.h>
#endif #endif
#if LIBINSTPATCH_SUPPORT
#include <libinstpatch/libinstpatch.h>
#endif
/*=================================sfload.c======================== /*=================================sfload.c========================
Borrowed from Smurf SoundFont Editor by Josh Green Borrowed from Smurf SoundFont Editor by Josh Green
=================================================================*/ =================================================================*/
@ -326,11 +330,13 @@ static int fluid_sffile_read_wav(SFData *sf, unsigned int start, unsigned int en
/** /**
* Check if a file is a SoundFont file. * Check if a file is a SoundFont file.
* @param filename Path to the file to check
* @return TRUE if it could be a SoundFont, FALSE otherwise
* *
* @note The current implementation only checks for the "RIFF" and "sfbk" headers in * If fluidsynth was built with DLS support, this function will also identify DLS files.
* the file. It is useful to distinguish between SoundFont and other (e.g. MIDI) files. * @param filename Path to the file to check
* @return TRUE if it could be a SF2, SF3 or DLS file, FALSE otherwise
*
* @note This function only checks whether header(s) in the RIFF chunk are present.
* A call to fluid_synth_sfload() might still fail.
*/ */
int fluid_is_soundfont(const char *filename) int fluid_is_soundfont(const char *filename)
{ {
@ -344,7 +350,7 @@ int fluid_is_soundfont(const char *filename)
{ {
return retcode; return retcode;
} }
if(FLUID_FREAD(&fcc, sizeof(fcc), 1, fp) != 1) if(FLUID_FREAD(&fcc, sizeof(fcc), 1, fp) != 1)
{ {
break; break;
@ -366,6 +372,21 @@ int fluid_is_soundfont(const char *filename)
} }
retcode = (fcc == SFBK_FCC); retcode = (fcc == SFBK_FCC);
if(retcode)
{
break; // seems to be SF2, stop here
}
#ifdef LIBINSTPATCH_SUPPORT
else
{
IpatchFileHandle *fhandle = ipatch_file_identify_open(filename, NULL);
if(fhandle != NULL)
{
retcode = (ipatch_file_identify(fhandle->file, NULL) == IPATCH_TYPE_DLS_FILE);
ipatch_file_close(fhandle);
}
}
#endif
} }
while(0); while(0);