[vlc-commits] fluidsynth: search /usr/share/soundfonts (fixes #25742)

[Rémi Denis-Courmont]

vlc/vlc-3.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Wed Feb 17 20:49:38 2021 +0200| [749948666d471e5e890aca731be1b49d1808e909] | committer: Rémi Denis-Courmont

fluidsynth: search /usr/share/soundfonts (fixes #25742)

(cherry picked from commit 4f3ebb95b92195b82eea68e2e0510534bf13fec1)

> http://git.videolan.org/gitweb.cgi/vlc/vlc-3.0.git/?a=commit;h=749948666d471e5e890aca731be1b49d1808e909
---

 modules/codec/fluidsynth.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/modules/codec/fluidsynth.c b/modules/codec/fluidsynth.c
index f461f3fd14..1212603281 100644
--- a/modules/codec/fluidsynth.c
+++ b/modules/codec/fluidsynth.c
@@ -129,7 +129,10 @@ static int Open (vlc_object_t *p_this)
     {
         glob_t gl;
 
-        glob ("/usr/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
+        glob("/usr/share/sounds/sf2/*.sf2", GLOB_NOESCAPE, NULL, &gl);
+        glob("/usr/share/soundfonts/*.sf2", GLOB_NOESCAPE | GLOB_APPEND, NULL,
+             &gl);
+
         for (size_t i = 0; i < gl.gl_pathc; i++)
         {
             const char *path = gl.gl_pathv[i];