Faster startup

Loading of selected soundfont is postponed until first play

Author: jwdj

.gitignore

@@ -59,7 +59,6 @@ build
 dist
 .vscode
 *.spec
-*.sf2
 *.pdb
 .vscode/settings.json
 .vscode/launch.json

easy_abc.py

@@ -2214,9 +2214,10 @@ def midiplayer_changed(self, path):
 
     def soundfont_changed(self, sf2_path):
         try:
-            wait = wx.BusyCursor()
-            self.mc.set_soundfont(sf2_path)         # load another sound font
-            del wait
+            if os.path.exists(sf2_path):
+                wait = wx.BusyCursor()
+                self.mc.set_soundfont(sf2_path)         # load another sound font
+                del wait
         except:
             pass
 
@@ -3904,8 +3905,12 @@ def __init__(self, parent, ID, app_dir, settings, options):
         self.uses_fluidsynth = False
         if fluidsynth_available and soundfont_path and os.path.exists(soundfont_path):
             try:
-                self.mc = FluidSynthPlayer(soundfont_path)
+                init_soundfont_path = os.path.join(application_path, 'sound', 'example.sf2')
+                if not os.path.exists(init_soundfont_path):
+                    init_soundfont_path = soundfont_path
+                self.mc = FluidSynthPlayer(init_soundfont_path)
                 self.uses_fluidsynth = True
+                self.mc.set_soundfont(soundfont_path, load_on_play=True)
             except Exception as e:
                 error_msg = traceback.format_exc()
                 self.mc = None
@@ -6343,7 +6348,7 @@ def OnMidiSettings(self, evt):
     def OnAbcSettings(self, evt):
         # 1.3.6.4 [SS] 2015-07-07
         win = wx.FindWindowByName('settingsbook')
-        if win is None:
+        if win is None or not self.settingsbook:
             self.settingsbook = MyNoteBook(self, self.settings, self.statusbar)
             self.settingsbook.Show()
         else:

fluidsynthplayer.py

@@ -21,18 +21,19 @@ def __init__(self, sf2_path):
             driver = 'pulseaudio'
 
         self.fs.start(driver)  # set default output driver and start clock
+        self.soundfont_path = sf2_path
         self.sfid = self.fs.sfload(sf2_path)
         self.fs.program_select(0, self.sfid, 0, 0)
         self.p = F.Player(self.fs)   # make a new player
         self.duration_in_ticks = 0   # length of midi file
         self.pause_time = 0        # time in midi ticks where player stopped
         self.pending_soundfont = None
 
-    def set_soundfont(self, sf2_path):         # load another sound font
-        if self.is_playing:
+    def set_soundfont(self, sf2_path, load_on_play=False):         # load another sound font
+        if self.is_playing or load_on_play:
             self.pending_soundfont = sf2_path
         else:
-            self.sf2 = sf2_path
+            self.soundfont_path = sf2_path
             if self.sfid >= 0:
                 self.fs.sfunload(self.sfid)
             self.sfid = self.fs.sfload(sf2_path)
@@ -46,7 +47,6 @@ def Load(self, path):          # load a midi file
         self.pause_time = 0       # resume playing at time == 0
         if os.path.exists(path):
             success = self.p.add(path)           # add file to playlist
-            self.p.play()
             self.OnAfterLoad.fire()
             return True
         return False
@@ -60,7 +60,8 @@ def Play(self):
         if self.is_playing:
             return
         if self.pending_soundfont:
-            self.set_soundfont(self.pending_soundfont)
+            if self.pending_soundfont != self.soundfont_path and os.path.exists(self.pending_soundfont):
+                self.set_soundfont(self.pending_soundfont)
             self.pending_soundfont = None
 
         self.p.play(self.pause_time)