midi2abc fix by Seymour

Fix from a while back to enable import of midi-files using Python 3.

Author: jwdj

easy_abc.py

@@ -887,11 +887,10 @@ def abc_to_svg(abc_code, cache_dir, settings, target_file_name=None, with_annota
     stderr_value = os.linesep.join([x for x in stderr_value.splitlines()
                                     if not x.startswith('abcm2ps-') and not x.startswith('File ') and not x.startswith('Output written on ')])
     stderr_value = stderr_value.strip()
-    if not os.path.exists(svg_file_first) or 'svg: ' in stderr_value:
-        return ([], stderr_value)
-    else:
+    if os.path.exists(svg_file_first):
         return (GetSvgFileList(svg_file_first), stderr_value)
-
+    else:
+        return ([], stderr_value)
 
 
 def AbcToAbc(abc_code, cache_dir, params, abc2abc_path=None):

fluidsynth.py

@@ -32,10 +32,15 @@ def b(s):
 
 if platform.system() == 'Windows':
     script_path = os.path.dirname(os.path.abspath(__file__))
+    import struct
+    bytesPerPointer = struct.calcsize("P")
     fluidsynth_lib_path = script_path + '\\bin\\fluidsynth'
+    if (bytesPerPointer == 4):
+        fluidsynth_lib_path += '\\X86'
+
     envpath = os.environ.get('PATH', '')
     os.environ['PATH'] = fluidsynth_lib_path + ';' + envpath
-    lib = 'libfluidsynth-2.dll'
+    lib = fluidsynth_lib_path + '\\libfluidsynth-2.dll'
 else:
     lib = 'libfluidsynth.so.2'
 

midi/MidiFileParser.py

@@ -42,7 +42,6 @@ def parseMThdChunk(self):
 
         header_chunk_type = raw_in.nextSlice(4)
         header_chunk_zise = raw_in.readBew(4)
-
         # check if it is a proper midi file
         if header_chunk_type != b'MThd':
             raise TypeError("It is not a valid midi file!")
@@ -189,4 +188,4 @@ def parseMTrkChunks(self):
     midi_in = MidiFileParser(RawInstreamFile(test_file), MidiToText())
     midi_in.parseMThdChunk()
     midi_in.parseMTrkChunks()
-    
+    

midi2abc.py

@@ -30,11 +30,6 @@
 from simple_abc_parser import get_best_key_for_midi_notes, get_accidentals_for_key
 from io import StringIO
 
-PY3 = sys.version_info.major > 2
-if PY3:
-    def unicode(s):
-        return s
-
 num_quarter_notes_per_bar = 3
 bars_per_line = 4
 
@@ -176,7 +171,7 @@ def note_to_string(note, duration, default_len, key_accidentals, cur_accidentals
         accidental_string = {-1: '_', -2: '__',
                              0: '=', 1: '^', 2: '^^'}[accidental_num]
 
-    octave = (note - middle_C) / 12
+    octave = (note - middle_C) // 12
 
     # handle the border cases of Cb and B# to make sure that we use the right octave
     if octave_note == 11 and accidental_num == -1:
@@ -359,7 +354,7 @@ def midi_to_abc(filename=None, notes=None, key=None, metre=Fraction(3, 4), defau
 
             # output broken rythm symbol if set
             if broken_rythm_symbol:
-                output.write(unicode(broken_rythm_symbol))
+                output.write(str(broken_rythm_symbol))
 
             # if a bow was previously started end it here
             if bow_started and not bow_started_here: