libretro/scummvm
1
0
Fork 0
mirror of https://github.com/libretro/scummvm.git synced 2024-11-30 21:00:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

AUDIO: Improve code to map the soundfont path to system path on iOS

Browse Source 
The code looks a bit less hack-ish and also now supports using path
in the application bundle and not only in the documents folder. It
could also help for other backends using a sandoxed filesystem.
This commit is contained in:
Thierry Crozat 2023-11-20 23:19:24 +00:00
parent ab13d18e58
commit cac0664757
1 changed files with 4 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
audio/softsynth/fluidsynth.cpp
View File

@ -49,9 +49,7 @@
#include "audio/mpu401.h"
#include "audio/softsynth/emumidi.h"
#include "gui/message.h"
#if defined(IPHONE_IOS7)
#include "backends/platform/ios7/ios7_common.h"
#endif
#include "backends/fs/fs-factory.h"
#ifdef __ANDROID__
#include "backends/fs/android/android-fs-factory.h"
#endif
@ -288,17 +286,10 @@ Common::String MidiDriver_FluidSynth::getSoundFontPath() const {
return path;
// First check if this is a full path
#if defined(IPHONE_IOS7)
// HACK: Due to the sandbox on non-jailbroken iOS devices, we need to deal
// with the chroot filesystem. All the path selected by the user are
// relative to the Document directory. So, we need to adjust the path to
// reflect that.
Common::FSNode fileNode(iOS7_getDocumentsDir() + path);
#else
Common::FSNode fileNode(path);
#endif
Common::String fullPath = g_system->getFilesystemFactory()->getSystemFullPath(path);
Common::FSNode fileNode(fullPath);
if (fileNode.exists())
return fileNode.getPath();
return fullPath;
// Then check with soundfontpath
if (ConfMan.hasKey("soundfontpath")) {