diff options
Diffstat (limited to 'libs/fluidsynth/src/fluid_sfont.c')
-rw-r--r-- | libs/fluidsynth/src/fluid_sfont.c | 22 |
1 files changed, 5 insertions, 17 deletions
diff --git a/libs/fluidsynth/src/fluid_sfont.c b/libs/fluidsynth/src/fluid_sfont.c index d0ce264d0c..04dd001768 100644 --- a/libs/fluidsynth/src/fluid_sfont.c +++ b/libs/fluidsynth/src/fluid_sfont.c @@ -24,26 +24,14 @@ void *default_fopen(const char *path) { - FILE* handle; + const char* msg; + FILE* handle = fluid_file_open(path, &msg); - if(!fluid_file_test(path, G_FILE_TEST_EXISTS)) + if(handle == NULL) { - FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Unable to load non-existent file. ('%s')", path); - return NULL; - } - - if(!fluid_file_test(path, G_FILE_TEST_IS_REGULAR)) - { - FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Refusing to load non-regular file! ('%s')", path); - return NULL; + FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Failed to open '%s': %s", path, msg); } - - if((handle = FLUID_FOPEN(path, "rb")) == NULL) - { - FLUID_LOG(FLUID_ERR, "fluid_sfloader_load(): Specified file does not exists or insufficient permissions to open it! ('%s')", path); - return NULL; - } - + return handle; } |