Update app.py

app.py

@@ -57,22 +57,12 @@ def render_midi(input_midi, render_type, soundfont_bank, render_sample_rate, cus
     #=======================================================
     # START PROCESSING
 
-    raw_score = TMIDIX.midi2single_track_ms_score(fdata, recalculate_channels=False)
-
-    escore = TMIDIX.advanced_score_processor(raw_score, return_score_analysis=False, return_enhanced_score_notes=True)[0]
-
-    first_note_index = raw_score[1].index(escore[0][:6])
-
-    for e in escore:
-        e[1] = int(e[1] / 16)
-        e[2] = int(e[2] / 16)
-
-    # Sorting by patch, pitch, then by start-time
-
-    escore.sort(key=lambda x: x[6])
-    escore.sort(key=lambda x: x[4], reverse=True)
-    escore.sort(key=lambda x: x[1])
-
+    raw_score = TMIDIX.midi2single_track_ms_score(fdata)
+    
+    escore = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
+    
+    escore= TMIDIX.augment_enhanced_score_notes(escore)
+    
     cscore = TMIDIX.chordify_score([1000, escore])
 
     meta_data = raw_score[1][:first_note_index] + [escore[0]] + [escore[-1]] + [raw_score[1][-1]]
@@ -87,31 +77,15 @@ def render_midi(input_midi, render_type, soundfont_bank, render_sample_rate, cus
         output_score = copy.deepcopy(escore)
 
     elif render_type == "Extract melody":
-        output_score = copy.deepcopy([c[0] for c in cscore if c[0][3] != 9])
+        melody_score = copy.deepcopy([c[0] for c in cscore if c[0][3] != 9])
         
-        for e in output_score:
+        for e in melody_score:
             e[3] = 0
 
             if e[4] < 60:
                 e[4] = (e[4] % 12) + 60
 
-        fixed_score = []
-    
-        for i in range(len(output_score)-1):
-          note = output_score[i]
-    
-          nmt = output_score[i+1][1]
-    
-          if note[1]+note[2] >= nmt:
-            note_dur = nmt-note[1]-1
-          else:
-            note_dur = note[2]
-    
-          fixed_score.append([note[0], note[1], note_dur, note[3], note[4], note[5], note[6]])
-    
-        fixed_score.append(output_score[-1])
-
-        output_score = copy.deepcopy(fixed_score)
+        output_score = TMIDIX.fix_monophonic_score_durations(melody_score)
 
     elif render_type == "Transform":