Update app.py

app.py

@@ -239,7 +239,7 @@ def Harmonize_Melody(input_src_midi,
         
         final_song.extend(all_chords_ptcs_chunks[sidx])
         
-        for i in tqdm.tqdm(range(chunk_length, len(harm_toks), chunk_length)):
+        for i in tqdm(range(chunk_length, len(harm_toks), chunk_length)):
         
           trg_chunk = np.array(harm_toks[i:i+chunk_length])
         
@@ -263,44 +263,80 @@ def Harmonize_Melody(input_src_midi,
         print('=' * 70)
         print('Done!')
         print('=' * 70)
-    
-    print('Rendering results...')
-    print('=' * 70)
 
-    output_score = []
-    
-    time = 0
-    
-    patches = [0] * 16
-    patches[0] = harmonized_accompaniment_MIDI_patch_number
-    
-    if base_MIDI_patch_number > -1:
-      patches[2] = base_MIDI_patch_number
-    
-    patches[3] = melody_MIDI_patch_number
+        print('Rendering textured results...')
+        print('=' * 70)
 
-    i = 0
+        output_score = []
+        
+        time = 0
+        
+        patches = [0] * 16
+        patches[0] = harmonized_accompaniment_MIDI_patch_number
+        
+        if base_MIDI_patch_number > -1:
+          patches[2] = base_MIDI_patch_number
+        
+        patches[3] = melody_MIDI_patch_number
     
-    for s in song:
-
-        if 11 < s < 141:
+        i = 0
+        
+        for s in final_song:
     
             time = mel_score[i][1] * 16
             dur = mel_score[i][2] * 16
             
             output_score.append(['note', time, dur, 3,  mel_score[i][4], 115+(mel_score[i][4] % 12), 40])
-
-            chord = TMIDIX.ALL_CHORDS_FILTERED[s-12]
             
-            for c in chord:
+            for c in s:
                 
-                pitch = 48+c
+                pitch = c
                 output_score.append(['note', time, dur, 0, pitch, max(40, pitch), harmonized_accompaniment_MIDI_patch_number])
                         
                 if base_MIDI_patch_number > -1:
-                    output_score.append(['note', time, dur, 2, chord[-1]+24, 120-chord[-1], base_MIDI_patch_number])
+                    output_score.append(['note', time, dur, 2, (s[-1] % 12) + 24, 120-(s[-1] % 12), base_MIDI_patch_number])
+
+            i += 1        
 
-            i += 1
+    else:
+    
+        print('Rendering results...')
+        print('=' * 70)
+    
+        output_score = []
+        
+        time = 0
+        
+        patches = [0] * 16
+        patches[0] = harmonized_accompaniment_MIDI_patch_number
+        
+        if base_MIDI_patch_number > -1:
+          patches[2] = base_MIDI_patch_number
+        
+        patches[3] = melody_MIDI_patch_number
+    
+        i = 0
+        
+        for s in song:
+    
+            if 11 < s < 141:
+        
+                time = mel_score[i][1] * 16
+                dur = mel_score[i][2] * 16
+                
+                output_score.append(['note', time, dur, 3,  mel_score[i][4], 115+(mel_score[i][4] % 12), 40])
+    
+                chord = TMIDIX.ALL_CHORDS_FILTERED[s-12]
+                
+                for c in chord:
+                    
+                    pitch = 48+c
+                    output_score.append(['note', time, dur, 0, pitch, max(40, pitch), harmonized_accompaniment_MIDI_patch_number])
+                            
+                    if base_MIDI_patch_number > -1:
+                        output_score.append(['note', time, dur, 2, chord[-1]+24, 120-chord[-1], base_MIDI_patch_number])
+    
+                i += 1
 
     fn1 = "Melody-Harmonizer-Transformer-Composition"