SoundFonts paths saving implementation

Author: ImAxel0

Openthesia/ProgramData.cs

@@ -18,6 +18,7 @@ private class SettingsJson
         public string InputDevice;
         public string OutputDevice;
         public List<string> MidiPaths = new();
+        public List<string> SoundFontsPaths = new();
         public bool KeyboardInput;
         public bool AnimatedBackground;
         public bool NeonFx;
@@ -86,6 +87,7 @@ public static void LoadSettings()
                 }
 
                 Settings.SetMidiPaths(storedSettings.MidiPaths);
+                Settings.SetSoundFontsPaths(storedSettings.SoundFontsPaths);
                 Settings.SetKeyboardInput(storedSettings.KeyboardInput);
                 Settings.SetAnimatedBackground(storedSettings.AnimatedBackground);
                 Settings.SetNeonFx(storedSettings.NeonFx);
@@ -125,6 +127,7 @@ public static void SaveSettings()
             InputDevice = Settings.IDevice?.Name,
             OutputDevice = Settings.ODevice?.Name,
             MidiPaths = Settings.MidiPaths,
+            SoundFontsPaths = Settings.SoundFontsPaths,
             KeyboardInput = Settings.KeyboardInput,
             AnimatedBackground = Settings.AnimatedBackground,
             NeonFx = Settings.NeonFx,

Openthesia/ScreenCanvas.cs

@@ -1023,7 +1023,7 @@ public static void RenderScreen(bool playMode = false)
                     _comboSoundFont = true;
                     foreach (var folderPath in Settings.SoundFontsPaths)
                     {
-                        foreach (var soundFontPath in Directory.GetFiles(folderPath))
+                        foreach (var soundFontPath in Directory.GetFiles(folderPath).Where(f => Path.GetExtension(f) == ".sf2"))
                         {
                             if (ImGui.Selectable(Path.GetFileNameWithoutExtension(soundFontPath)))
                             {

Openthesia/Settings.cs

@@ -22,7 +22,6 @@ public class Settings
 
     public static List<string> MidiPaths { get { return _midiPaths; } }
 
-
     private static List<string> _soundFontsPaths = new()
     {
         Path.Combine(Path.GetDirectoryName(Environment.ProcessPath), "SoundFonts"),
@@ -70,9 +69,20 @@ public enum Themes
 
     public static void SetMidiPaths(List<string> paths)
     {
+        if (paths.Count == 0)
+            return;
+
         _midiPaths = paths;
     }
 
+    public static void SetSoundFontsPaths(List<string> paths)
+    {
+        if (paths.Count == 0)
+            return;
+
+        _soundFontsPaths = paths;
+    }
+
     public static void SetKeyboardInput(bool onoff)
     {
         _keyboardInput = onoff;
@@ -346,11 +356,11 @@ public static void Render()
         ImGui.EndTable();
 
         ImGui.SetCursorPosX(ImGui.GetContentRegionAvail().X - 100 * FontController.DSF);
-        if (ImGui.Button(FontAwesome6.FolderPlus, new Vector2(100, 50) * FontController.DSF))
+        if (ImGui.Button($"{FontAwesome6.FolderPlus}##addMidiPath", new Vector2(100, 50) * FontController.DSF))
         {
             var dlg = new FolderPicker();
             dlg.InputPath = "C:\\";
-            if (dlg.ShowDialog(Program._window.SdlWindowHandle) == true)
+            if (dlg.ShowDialog(Program._window.Handle) == true)
             {
                 if (_midiPaths.Contains(dlg.ResultPath))
                 {
@@ -435,11 +445,11 @@ public static void Render()
         ImGui.EndTable();
 
         ImGui.SetCursorPosX(ImGui.GetContentRegionAvail().X - 100 * FontController.DSF);
-        if (ImGui.Button($"{FontAwesome6.Folder}", new Vector2(100, 50) * FontController.DSF))
+        if (ImGui.Button($"{FontAwesome6.FolderPlus}##addSoundPath", new Vector2(100, 50) * FontController.DSF))
         {
             var dlg = new FolderPicker();
             dlg.InputPath = "C:\\";
-            if (dlg.ShowDialog(Program._window.SdlWindowHandle) == true)
+            if (dlg.ShowDialog(Program._window.Handle) == true)
             {
                 if (_soundFontsPaths.Contains(dlg.ResultPath))
                 {