Updated xml2abc and abc2xml

- Updated xml2abc and abc2xml
- sorting of tunes is now case insensitive

Author: jwdj

.gitignore

@@ -47,6 +47,13 @@ Temporary Items
 
 # Compiled Python
 *.pyc
+*.pyd
+
+# Executables/DLL
+*.exe
+*.dll
 
 abc_styler - geen succes.py
 *.stackdump
+build
+dist

.vscode/settings.json

@@ -1,5 +1,6 @@
 {
-    "python.pythonPath": "C:/Python27/python.exe",
+    //"python.pythonPath": "C:/Python27/python.exe",
+    "python.pythonPath": "C:/Python36-32/python.exe",
 
     "files.exclude": {
         "**/*.pyc": true,

abc2xml.py

@@ -1,7 +1,7 @@
 #!/usr/bin/python2.7
 #
 
-program_name = 'EasyABC 1.3.7.8 2018-01-04'
+program_name = 'EasyABC 1.3.7.8 2018-04-23'
 
 # Copyright (C) 2011-2014 Nils Liberg (mail: kotorinl at yahoo.co.uk)
 # Copyright (C) 2015-2018 Seymour Shlien (mail: [email protected]), Jan Wybren de Jong (jw_de_jong at yahoo dot com)
@@ -673,7 +673,7 @@ def sort_abc_tunes(abc_code, sort_fields, keep_free_text=True):
             preceeding_lines.append(line)
 
     def get_sort_key_for_tune(tune, sort_fields):
-        return tuple([tune.header.get(f, '') for f in sort_fields])
+        return tuple([tune.header.get(f, '').lower() for f in sort_fields])
 
     tunes = [(get_sort_key_for_tune(t, sort_fields), t) for t in tunes]
     tunes.sort()
@@ -2084,7 +2084,8 @@ def __init__(self, parent, settings, statusbar):
             PathEntry('midi2abc', _('midi2abc executable:'), _('This executable is used to disassemble the output midi file'), True),
             PathEntry('gs', _('ghostscript executable:'), _('This executable is used to create PDF files'), False),
             PathEntry('nwc2xml', _('nwc2xml executable:'), _('For NoteWorthy Composer - Windows only'), False),
-            PathEntry('midiplayer', _('midiplayer:'), _('Your preferred MIDI player'), False)
+            PathEntry('midiplayer', _('midiplayer:'), _('Your preferred MIDI player'), False),
+            PathEntry('soundfont', _('soundfont:'), _('Your preferred Sound Font (.sf2)'), False)
         ]
 
         if wx.Platform == "__WXMSW__":
@@ -4204,11 +4205,9 @@ def play():
                 self.mc.Seek(0)  # When using wx.media.MEDIABACKEND_QUICKTIME the music starts playing too early (when loading a file)
                 time.sleep(0.5)  # hopefully this fixes the first notes not being played
             self.play()
-        print('blabla')
         wx.CallAfter(play)
 
     def OnAfterStop(self):
-        print('OnAfterStop')
         # 1.3.6.3 [SS] 2015-05-04
         self.flip_tempobox(False)
         self.stop_playing()
@@ -5007,7 +5006,8 @@ def export_tune(self, tune, file_type, extension, convert_func, path, show_save_
             finally:
                 dlg.Destroy() # 1.3.6.3 [JWDJ] 2015-04-21 always clean up dialog window
 
-        filepath = filepath.encode('utf-8')
+        if not PY3:
+            filepath = filepath.encode('utf-8')
         if convert_func(tune, filepath):
             execmessages = execmessages + u'creating '+ filepath + u'\n'
             # 1.3.6 [SS] 2014-12-08
@@ -7542,10 +7542,10 @@ def OnDropFile(self, filename):
         global execmessages, visible_abc_code
         info_messages = []
         # [SS] 2014-12-18
-        options = namedtuple ('Options', 'u m c d n b v x p j t v1 ped')                     # emulate the options object
+        options = namedtuple ('Options', 'u m c d n b v x p j t v1 ped s')                     # emulate the options object
         options.m = 0; options.j = 0; options.p = []; options.b = 0; options.d = 0  # unused options
         options.n = 0; options.v = 0; options.u = 0; options.c = 0; options.x = 0   # but all may be used if needed
-        options.t = 0; options.v1 = False; options.ped = True
+        options.t = 0; options.v1 = False; options.ped = True; options.s = 0
         if self.settings['xmlunfold']:
             options.u = 1
         if self.settings['xmlmidi']:

easy_abc.py

@@ -33,7 +33,7 @@ def Load(self, path):
     def Length(self):
         return 0
 
-    def Tell():
+    def Tell(self):
         return 0
 
     @property
@@ -64,7 +64,7 @@ def __init__(self, parent_window, backend=None):
         parent_window.Bind(wx.media.EVT_MEDIA_STOP, self.OnMediaStop)
 
     def Play(self):
-        print('Play')
+        # print('Play')
         if wx.Platform != "__WXMAC__":
             try: self.mc.Volume = 0.9
             except: pass
@@ -75,7 +75,7 @@ def Play(self):
         self.is_really_playing = True
 
     def Stop(self):
-        print('Stop')
+        # print('Stop')
         self.is_really_playing = False
         self.mc.Stop()
         self.mc.Load('NONEXISTANT_FILE____.mid') # be sure the midi file is released 2014-10-25 [SS]
@@ -113,12 +113,12 @@ def is_paused(self):
         return self.mc.GetState() == wx.media.MEDIASTATE_PAUSED
 
     def OnMediaLoaded(self, evt):
-        print('OnMediaLoaded')
+        # print('OnMediaLoaded')
         if self.OnAfterLoad is not None:
             self.OnAfterLoad()
 
     def OnMediaStop(self, evt):
-        print('Media stopped')
+        # print('Media stopped')
         # if media is finished but playback as a loop was used relaunch the playback immediatly
         # and prevent media of being stop (event is vetoed as explained in MediaCtrl documentation)
         if self.loop_midi_playback:
@@ -127,25 +127,29 @@ def OnMediaStop(self, evt):
             wx.CallAfter(self.play_again)
 
     def OnMediaFinished(self, evt):
-        print('Media finished')
+        # print('Media finished')
         # if media is finished but playback as a loop was used relaunch the playback immediatly
         # (OnMediaStop should already have restarted it if required as event STOP arrive before FINISHED)
         self.is_really_playing = False
         if self.loop_midi_playback:
             self.play_again()
         elif self.OnAfterStop is not None:
-            print('Media OnAfterStop')
+            # print('Media OnAfterStop')
             self.OnAfterStop()
 
     def play_again(self):
-        if self.is_playing():
+        if self.is_playing:
             self.Seek(0)
         else:
             self.Seek(0)
             self.Play()
             self.set_playback_rate(self.last_playback_rate)
             #self.update_playback_rate()
             self.is_really_playing = True
+    
+    def set_playback_rate(self, playback_rate):
+        if self.mc and (self.is_playing or wx.Platform != "__WXMAC__"): # after setting playbackrate on Windows the self.mc.GetState() becomes MEDIASTATE_STOPPED
+            self.mc.PlaybackRate = playback_rate        
 
 
 
@@ -179,7 +183,7 @@ def set_soundfont(self, sf2_path):         # load another sound font
     def load(self, path):          # load a midi file
         self.reset()              # reset the player, empty the playlist
         self.pause_time  = 0       # resume playing at time == 0
-        self.p.add(fnm)           # add file to playlist
+        self.p.add(path)           # add file to playlist
         self.p.load()             # load first file from playlist
         self.dur = max ([self.p.get_length (i) for i in range (16)])  # get max length of all tracks
         if self.p.get_status() == 2:  # not a midi file
@@ -188,9 +192,9 @@ def load(self, path):          # load a midi file
 
     def reset(self):              # the only way to empty the playlist ...
         self.p.delete()           # delete player
-        self.p = F.Player(s.fs)   # make a new one
+        self.p = F.Player(self.fs)   # make a new one
 
-    def play(s):
+    def play(self):
         if self.playing:
             self.pause_time = self.p.stop()
             self.playing = 0

midiplayer.py

@@ -1,3 +0,0 @@
-pywin32
-cx_Freeze
-mechanize