mirror of
https://github.com/ZDoom/fluidsynth.git
synced 2024-11-10 15:01:40 +00:00
Fixed some warnings in fluid_filerenderer and improved -T, -E, -O help output for case where libsndfile support not enabled.
This commit is contained in:
parent
e0a18f7c2a
commit
ae6b17d916
2 changed files with 16 additions and 3 deletions
|
@ -105,19 +105,19 @@ static int fluid_file_renderer_find_file_type (char *extension, int *type);
|
|||
|
||||
|
||||
/* File type names. */
|
||||
char *type_names[] = {
|
||||
const char *type_names[] = {
|
||||
"raw",
|
||||
NULL /* Terminator */
|
||||
};
|
||||
|
||||
/* File audio format names. */
|
||||
char *format_names[] = {
|
||||
const char *format_names[] = {
|
||||
"s16",
|
||||
NULL /* Terminator */
|
||||
};
|
||||
|
||||
/* File endian byte order names. */
|
||||
char *endian_names[] = {
|
||||
const char *endian_names[] = {
|
||||
"cpu",
|
||||
NULL
|
||||
};
|
||||
|
|
|
@ -371,8 +371,13 @@ int main(int argc, char** argv)
|
|||
for (sp = names; *sp; sp++)
|
||||
printf (" %s", *sp);
|
||||
|
||||
#if LIBSNDFILE_SUPPORT
|
||||
printf ("\n\nauto: Use audio file format's default endian byte order\n"
|
||||
"cpu: Use CPU native byte order\n");
|
||||
#else
|
||||
printf ("\n\nNOTE: No libsndfile support!\n"
|
||||
"cpu: Use CPU native byte order\n");
|
||||
#endif
|
||||
exit (0);
|
||||
}
|
||||
else fluid_settings_setstr(settings, "audio.file.endian", optarg);
|
||||
|
@ -427,7 +432,11 @@ int main(int argc, char** argv)
|
|||
for (sp = names; *sp; sp++)
|
||||
printf (" %s", *sp);
|
||||
|
||||
#if LIBSNDFILE_SUPPORT
|
||||
printf ("\n");
|
||||
#else
|
||||
printf ("\n\nNOTE: No libsndfile support!\n");
|
||||
#endif
|
||||
exit (0);
|
||||
}
|
||||
else fluid_settings_setstr(settings, "audio.file.format", optarg);
|
||||
|
@ -465,7 +474,11 @@ int main(int argc, char** argv)
|
|||
for (sp = names; *sp; sp++)
|
||||
printf (" %s", *sp);
|
||||
|
||||
#if LIBSNDFILE_SUPPORT
|
||||
printf ("\n\nauto: Determine type from file name extension, defaults to \"wav\"\n");
|
||||
#else
|
||||
printf ("\n\nNOTE: No libsndfile support!\n");
|
||||
#endif
|
||||
exit (0);
|
||||
}
|
||||
else fluid_settings_setstr(settings, "audio.file.type", optarg);
|
||||
|
|
Loading…
Reference in a new issue