zdoom/fluidsynth
0
0
Fork 0
mirror of https://github.com/ZDoom/fluidsynth.git synced 2025-04-22 07:30:50 +00:00
Code Issues Projects Releases Packages Wiki Activity

file name handling fixed

Browse source
This commit is contained in:
David Henningsson 2009-10-08 21:59:35 +00:00
parent f49fed5e83
commit aac65ca01a
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
fluidsynth/src/fluid_filerenderer.c
View file

@ -144,11 +144,12 @@ fluid_file_renderer_t *
new_fluid_file_renderer(fluid_synth_t* synth)
{
#if LIBSNDFILE_SUPPORT
char *filename, *type, *format, *endian;
char *type, *format, *endian;
SF_INFO info;
double samplerate;
int retval;
#endif
char *filename = NULL;
fluid_file_renderer_t* dev;
fluid_return_val_if_fail (synth != NULL, NULL);
@ -177,6 +178,7 @@ new_fluid_file_renderer(fluid_synth_t* synth)
goto error_recovery;
}
fluid_settings_dupstr (synth->settings, "audio.file.name", &filename);
if (filename == NULL) {
FLUID_LOG(FLUID_ERR, "No file name specified");
goto error_recovery;
@ -187,14 +189,12 @@ new_fluid_file_renderer(fluid_synth_t* synth)
info.format = FLUID_FILE_RENDERER_DEFAULT_FILE_TYPE | SF_FORMAT_PCM_16;
fluid_settings_dupstr (synth->settings, "audio.file.name", &filename);
fluid_settings_dupstr (synth->settings, "audio.file.type", &type);
fluid_settings_dupstr (synth->settings, "audio.file.format", &format);
fluid_settings_dupstr (synth->settings, "audio.file.endian", &endian);
retval = fluid_file_renderer_parse_options (type, format, endian, filename, &info);
if (filename) FLUID_FREE (filename);
if (type) FLUID_FREE (type);
if (format) FLUID_FREE (format);
if (endian) FLUID_FREE (endian);
@ -233,6 +233,7 @@ new_fluid_file_renderer(fluid_synth_t* synth)
return dev;
error_recovery:
if (filename) FLUID_FREE (filename);
delete_fluid_file_renderer(dev);
return NULL;
}
@ -413,7 +414,7 @@ fluid_file_renderer_parse_options (char *filetype, char *format, char *endian,
s = FLUID_STRRCHR (filename, '.');
if (s && s[1] != '\0')
{
{
if (!fluid_file_renderer_find_file_type (s + 1, &type))
FLUID_LOG (FLUID_WARN, "Failed to determine audio file type from filename, defaulting to WAV");
}