#20 additionnal enhancements to behavior of MIDI playback on Mac

Author: aupfred

easy_abc.py

@@ -4143,7 +4143,7 @@ def __init__(self, parent, ID, app_dir, settings, options):
 
         self.play_timer = wx.Timer(self)
         self.Bind(wx.EVT_TIMER, self.OnPlayTimer, self.play_timer)
-        self.play_timer.Start(50) #FAU:MIDIPLAY: Todo need to check if this is still needed
+        self.play_timer.Start(50)
         self.music_update_thread.start()
         self.update_multi_tunes_menu_items()
 
@@ -4492,12 +4492,15 @@ def OnMouseWheel(self, evt):
             evt.Skip()
 
     def play(self):
+        self.play_timer.Start(50)
         if self.settings.get('follow_score', False) and self.current_page_index != 0:
             self.select_page(0)
         wx.CallAfter(self.mc.Play)
 
     def stop_playing(self):
         self.mc.Stop()
+        #FAU:remove highlighted notes
+        self.music_pane.draw_notes_highlighted(None)
         #FAU:MIDIPLAY: play timer can be stopped no need to update progress slider
         self.play_timer.Stop()
         self.play_button.SetBitmap(self.play_bitmap)
@@ -4573,11 +4576,12 @@ def do_load_media_file(self, path):
                 self.mc.Play() # does not start playing but triggers OnMediaLoaded event
             #FAU:MIDIPLAY: added support for playback for Mac with SMF player For now kept apart from Windows
             #FAU:MIDIPLAY: %%TODO%% verify if can be merged with preceeding if
-            elif wx.Platform == "__WXMAC__":
-                self.mc.Play()
+            #FAU:MIDIPLAY: 20250125 Not needed as correctly started based on OnMediaLoaded
+            #elif wx.Platform == "__WXMAC__":
+            #    self.mc.Play()
                 #FAU:MIDIPLAY: Start timer to be able to have progress bar updated
-                self.play_timer.Start(20)
-                self.play_button.SetBitmap(self.pause_bitmap)
+            #    self.play_timer.Start(20)
+            #    self.play_button.SetBitmap(self.pause_bitmap)
         else:
             wx.MessageBox(_("Unable to load %s: Unsupported format?") % path,
                           _("Error"), wx.ICON_ERROR | wx.OK)
@@ -4588,7 +4592,7 @@ def play():
             #    time.sleep(0.3) # 1.3.6.4 [JWDJ] on Mac the first note is skipped the first time. hope this helps
             # self.mc.Seek(self.play_start_offset, wx.FromStart)
             self.play_button.SetBitmap(self.pause_bitmap)
-            self.progress_slider.SetRange(0, self.mc.Length())
+            self.progress_slider.SetRange(0, int(self.mc.Length())) #FAU:MIDIPLAY: mplay might return a float. thus forcing an int
             self.progress_slider.SetValue(0)
             self.OnBpmSlider(None)
             self.update_playback_rate()
@@ -4600,10 +4604,16 @@ def play():
         wx.CallAfter(play)
 
     def OnAfterStop(self):
+        self.set_loop_midi_playback(False)
         # 1.3.6.3 [SS] 2015-05-04
         self.stop_playing()
-        self.reset_BpmSlider()
-        self.flip_tempobox(False)
+        #FAU preserve latest bpm choice
+        #self.reset_BpmSlider()
+        #FAU20250125: Do not hide it if supported
+        if self.settings['midiplayer_path']:
+            self.flip_tempobox(False)
+        if wx.Platform != "__WXMSW__":
+            self.toolbar.Realize() # 1.3.6.4 [JWDJ] fixes toolbar repaint bug for Windows
 
     def OnToolRecord(self, evt):
         if self.record_thread and self.record_thread.is_running:
@@ -4622,22 +4632,24 @@ def OnToolRecord(self, evt):
                 self.record_thread.start()
 
     def OnToolStop(self, evt):
-        self.set_loop_midi_playback(False)
-        self.stop_playing()
+        #FAU 20250125: Cleaning, trying to centralised what is common to Stop avoiding of mon to Stop instead of multiple call
+        self.OnAfterStop()
+        #self.set_loop_midi_playback(False)
+        #self.stop_playing()
         # 1.3.6.3 [SS] 2015-04-03
         #self.play_panel.Show(False)
-        self.flip_tempobox(False)
-        self.progress_slider.SetValue(0)
+        #self.flip_tempobox(False)
+        #self.progress_slider.SetValue(0)
         # self.reset_BpmSlider()     #[EPO] 2018-11-20 make sticky - this is new functionality
-        if wx.Platform != "__WXMSW__":
-            self.toolbar.Realize() # 1.3.6.4 [JWDJ] fixes toolbar repaint bug for Windows
+        #if wx.Platform != "__WXMSW__":
+        #    self.toolbar.Realize() # 1.3.6.4 [JWDJ] fixes toolbar repaint bug for Windows
         if self.record_thread and self.record_thread.is_running:
             self.OnToolRecord(None)
-        if self.uses_fluidsynth:
-            self.OnAfterStop()
+        #if self.uses_fluidsynth:
+        #    self.OnAfterStop()
 
     def OnSeek(self, evt):
-        self.mc.Seek(self.progress_slider.GetValue()) #FAU:MIDIPLAY: %%TODO%% verify on Mac if strange behavior still present
+        self.mc.Seek(self.progress_slider.GetValue())
 
     def OnZoomSlider(self, evt):
         old_factor = self.zoom_factor
@@ -4660,26 +4672,28 @@ def OnPlayTimer(self, evt):
 
                 if wx.Platform == "__WXMAC__": #FAU:MIDIPLAY: Used to give the hand to MIDI player
                     delta = self.mc.IdlePlay()
+                    #print(self.mc.get_songinfo)
                     if delta == 0:
                         if self.loop_midi_playback:
                             self.mc.Seek(0)
                         else:
-                            self.stop_playing()
-
+                            self.mc.is_play_started = False
+                
                 offset = self.mc.Tell()
                 if offset >= self.progress_slider.Max:
                     length = self.mc.Length()
                     self.progress_slider.SetRange(0, int(length)) #FAU:MIDIPLAY: mplay might return a float. thus forcing an int
-
+                
                 if self.settings.get('follow_score', False):
                     self.queue_number_follow_score += 1
                     queue_number = self.queue_number_follow_score
-                    wx.CallLater(1, self.FollowScore, offset, queue_number) #[EPO] 2018-11-20  first arg 0 causes exception
-
+                    #wx.CallLater(1, self.FollowScore, offset, queue_number) #[EPO] 2018-11-20  first arg 0 causes exception
+                    self.FollowScore(offset, queue_number)
+                
                 self.progress_slider.SetValue(offset)
-            elif self.started_playing and self.uses_fluidsynth and not self.mc.is_paused:
+            elif self.started_playing and not self.mc.is_paused: #and self.uses_fluidsynth 
                 self.started_playing = False
-                self.OnToolStop(None)
+                wx.CallLater(500, self.OnAfterStop)
 
     def FollowScore(self, offset, queue_number):
         if self.queue_number_follow_score != queue_number:

mplay/smf_easyabc.py

@@ -345,11 +345,10 @@ def read(self, path):
         for ev in self.ev:
             (at, message, me_type, data) = ev
             if message == 0xff and me_type == 0x51:
-                self.playing_time += (at - start) / self.division * \
-                    tempo / 1000
+                self.playing_time += (at - start) * tempo / self.division / 1000
                 start = at
                 tempo = (data[0] << 16) | (data[1] << 8) | data[2]
-        self.playing_time += (at - start) / self.division * tempo / 1000
+        self.playing_time += (at - start)  * tempo / self.division / 1000
 
     def fileinfo(self):
         hsecs = self.playing_time // 10
@@ -392,7 +391,7 @@ def getsongposition(self):
         else:
             now = (time() - self.elapsed_time) * 1000
         ticks = int(now * self.division * 1000 / self.tempo)
-        return ticks
+        return int(ticks)
 
     def beatinfo(self):
         if self.pause != 0:
@@ -461,6 +460,15 @@ def songposition(self, beat):
                 break
             self.next += 1
 
+    def gotosongposition(self, song_position):
+        #Need to turn off all currently note played otherwise will keep sounding
+        for ch in range(16):
+            self.allnotesoff(ch)
+        self.songposition(song_position)
+        if self.pause != 0:
+            self.pause = time()
+
+    
     def setsong(self, **info):
         #print("FAU setsong")
         if 'shift' in info:
@@ -484,15 +492,13 @@ def setsong(self, **info):
             self.tempo = 60000000 / self.bpm #* 4 / self.denominator
             self.elapsed_time = now - (now - self.elapsed_time) * \
                 self.tempo / tempo
+        elif 'goto' in info:
+            self.gotosongposition(info['goto']/self.division)
         elif 'bar' in info:
             now = (time() - self.elapsed_time) * 1000
             beat = int(now * 1000 / self.tempo)
             beat += 4 * info['bar'] - (beat % 4)
-            for ch in range(16):
-                self.allnotesoff(ch)
-            self.songposition(beat)
-            if self.pause != 0:
-                self.pause = time()
+            self.gotosongposition(beat)
         elif 'action' in info:
             if info['action'] == 'exit':
                 for ch in range(16):
@@ -668,6 +674,13 @@ def read(path):
 def play(midi, dev, wait=True):
     return midi.play(dev, wait)
 
+#FAU20250125: Added to seek to a position
+#songposition (time-elapsed_time)*1000*division*1000/tempo
+#beat (time-elapsedtime)*1000*1000/tempo
+#playing_time (at_fin - at_start) / self.division * tempo / 1000
+    
+def songposition(midi, song_position):
+    return midi.songposition(song_position/midi.division)
 
 def fileinfo(midi):
     return midi.fileinfo()

mplaysmfplayer.py

@@ -15,6 +15,7 @@
 from midiplayer import MidiPlayer
 from mplay.smf_easyabc import read, play, fileinfo, songinfo, beatinfo, lyrics, chordinfo, \
     setsong, channelinfo, setchannel, families, instruments
+    setsong, channelinfo, setchannel, families, instruments, songposition
 
 if sys.platform == 'darwin':
     from mplay.darwinmidi import midiDevice
@@ -54,6 +55,8 @@ def __init__(self, parent_window=None, backend=None):
     def Load(self, path):
         if os.path.exists(path):
             self.midi_file = read(path)
+            #FAU:MIDIPLAY: 20250125 Add the call to the EasyABC event
+            self.OnAfterLoad.fire()
             return True
         return False
 
@@ -70,9 +73,14 @@ def Play(self):
 
     #FAU 20201229: Function is added to allow playing on timer Play() is used to keep same interface for EasyABC for the pause feature
     def IdlePlay(self):
-        delta = play(self.midi_file, self.device, False)
-        self.is_really_playing = True
-        return delta
+        if self.is_playing:
+            delta = play(self.midi_file, self.device, False)
+            self.is_really_playing = True
+            #if delta == 0:
+            #    self.OnAfterStop.fire()
+            return delta
+        else:
+            return 0.04
 
     def Pause(self):
         setsong(self.midi_file, action='pause')
@@ -88,10 +96,10 @@ def Stop(self):
     def Seek(self, time):
         if time > self.Length() or time < 0:
             return
-        self.midi_file.songposition(time)
-
+        setsong(self.midi_file, goto=time)
+        
     def Length(self):
-        return self.midi_file.playing_time
+        return self.midi_file.playing_time-960
 
     def Tell(self):
         return self.midi_file.getsongposition()
@@ -121,5 +129,11 @@ def supports_tempo_change_while_playing(self):
     @property
     def unit_is_midi_tick(self):
         return True
+    
+    @property
+    def get_songinfo(self):
+        return songinfo(self.midi_file)
+    
+