Update app.py

app.py

@@ -35,109 +35,88 @@ def read_MIDI(input_midi)
     #=======================================================
     # PRE-PROCESSING
     
-    # checking number of instruments in a composition
-    instruments_list_without_drums = list(set([y[3] for y in events_matrix1 if y[3] != 9]))
     instruments_list = list(set([y[3] for y in events_matrix1]))
     
-    if len(events_matrix1) > 0 and len(instruments_list_without_drums) > 0:
+    #======================================
+
+    events_matrix1 = TMIDIX.augment_enhanced_score_notes(events_matrix1, timings_divider=16)
     
-      #======================================
+    #=======================================================
+    # FINAL PROCESSING
     
-      events_matrix2 = []
+    melody_chords = []
+    melody_chords2 = []
     
-      # Recalculating timings
-      for e in events_matrix1:
+    # Break between compositions / Intro seq
     
-          # Original timings
-          e[1] = int(e[1] / 16)
-          e[2] = int(e[2] / 16)
+    if 9 in instruments_list:
+      drums_present = 19331 # Yes
+    else:
+      drums_present = 19330 # No
     
-      #===================================
-      # ORIGINAL COMPOSITION
-      #===================================
+    if events_matrix1[0][3] != 9:
+      pat = events_matrix1[0][6]
+    else:
+      pat = 128
     
-      # Sorting by patch, pitch, then by start-time
+    melody_chords.extend([19461, drums_present, 19332+pat]) # Intro seq
     
-      events_matrix1.sort(key=lambda x: x[6])
-      events_matrix1.sort(key=lambda x: x[4], reverse=True)
-      events_matrix1.sort(key=lambda x: x[1])
+    #=======================================================
+    # MAIN PROCESSING CYCLE
+    #=======================================================
     
-      #=======================================================
-      # FINAL PROCESSING
+    abs_time = 0
     
-      melody_chords = []
-      melody_chords2 = []
+    pbar_time = 0
     
-      # Break between compositions / Intro seq
+    pe = events_matrix1[0]
     
-      if 9 in instruments_list:
-          drums_present = 19331 # Yes
-      else:
-          drums_present = 19330 # No
+    chords_counter = 1
     
-      if events_matrix1[0][3] != 9:
-          pat = events_matrix1[0][6]
-      else:
-          pat = 128
+    comp_chords_len = len(list(set([y[1] for y in events_matrix1])))
     
-      melody_chords.extend([19461, drums_present, 19332+pat]) # Intro seq
+    for e in events_matrix1:
     
       #=======================================================
-      # MAIN PROCESSING CYCLE
-      #=======================================================
+      # Timings...
     
-      abs_time = 0
+      # Cliping all values...
+      delta_time = max(0, min(255, e[1]-pe[1]))
     
-      pbar_time = 0
+      # Durations and channels
     
-      pe = events_matrix1[0]
+      dur = max(0, min(255, e[2]))
+      cha = max(0, min(15, e[3]))
     
-      chords_counter = 1
-    
-      comp_chords_len = len(list(set([y[1] for y in events_matrix1])))
-    
-      for e in events_matrix1:
-    
-          #=======================================================
-          # Timings...
-    
-          # Cliping all values...
-          delta_time = max(0, min(255, e[1]-pe[1]))
-    
-          # Durations and channels
-    
-          dur = max(0, min(255, e[2]))
-          cha = max(0, min(15, e[3]))
-    
-          # Patches
-          if cha == 9: # Drums patch will be == 128
-              pat = 128
+      # Patches
+      if cha == 9: # Drums patch will be == 128
+          pat = 128
     
-          else:
-              pat = e[6]
+      else:
+          pat = e[6]
     
-          # Pitches
+      # Pitches
     
-          ptc = max(1, min(127, e[4]))
+      ptc = max(1, min(127, e[4]))
     
-          # Velocities
+      # Velocities
     
-          # Calculating octo-velocity
-          vel = max(8, min(127, e[5]))
-          velocity = round(vel / 15)-1
+      # Calculating octo-velocity
+      vel = max(8, min(127, e[5]))
+      velocity = round(vel / 15)-1
     
-          #=======================================================
-          # FINAL NOTE SEQ
+      #=======================================================
+      # FINAL NOTE SEQ
     
-          # Writing final note asynchronously
+      # Writing final note asynchronously
     
-          dur_vel = (8 * dur) + velocity
-          pat_ptc = (129 * pat) + ptc
+      dur_vel = (8 * dur) + velocity
+      pat_ptc = (129 * pat) + ptc
     
-          melody_chords.extend([delta_time, dur_vel+256, pat_ptc+2304])
-          melody_chords2.append([delta_time, dur_vel+256, pat_ptc+2304])
+      melody_chords.extend([delta_time, dur_vel+256, pat_ptc+2304])
+      melody_chords2.append([delta_time, dur_vel+256, pat_ptc+2304])
     
-          pe = e
+      pe = e
 
     return melody_chords, melody_chords2