Update app.py

app.py

@@ -19,7 +19,42 @@ import matplotlib.pyplot as plt
 in_space = os.getenv("SYSTEM") == "spaces"
          
 # =================================================================================================
-                       
+
+def mix_chord(chord, tones_chord, mel_patch, mel_pitch):
+
+  cho = []
+
+  for k, g in groupby(sorted(chord, key=lambda x: x[6]), lambda x: x[6]):
+
+    if k != 128:
+      if k == mel_patch:
+        cg = list(g)
+        c = copy.deepcopy(cg[0])
+        c[4] = mel_pitch
+        c[5] = 105 + (mel_pitch % 12)
+        cho.append(c)
+
+      else:
+        cg = list(g)
+
+        tclen = len(tones_chord)
+
+        if len(cg) > tclen:
+          tones_chord = tones_chord + [random.choice(tones_chord) for _ in range(len(cg)-tclen)]
+
+        for i, cc in enumerate(cg):
+          c = copy.deepcopy(cc)
+          c[4] = ((c[4] // 12) * 12) +tones_chord[i]
+          c[5] += c[4] % 12
+          cho.append(c)
+
+    else:
+      cho.extend(list(g))
+
+  return cho
+
+# =================================================================================================
+
 def MixMelody(input_midi):
     print('=' * 70)
     print('Req start time: {:%Y-%m-%d %H:%M:%S}'.format(datetime.datetime.now(PDT)))
@@ -32,9 +67,6 @@ def MixMelody(input_midi):
 
     print('-' * 70)
     print('Input file name:', fn)
-    print('Req channel:', input_channel)
-    print('Req patch:', input_patch)
-    print('Req start chord:', input_start_chord)
     print('-' * 70)
 
     #===============================================================================
@@ -43,35 +75,44 @@ def MixMelody(input_midi):
     #===============================================================================
     # Enhanced score notes
     
-    escore_notes = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
+    raw_escore = TMIDIX.advanced_score_processor(raw_score, return_enhanced_score_notes=True)[0]
     
-    if len(escore_notes) > 0:
+    if len(raw_escore) > 0:
     
-        #=======================================================
-        # PRE-PROCESSING
-        
         #===============================================================================
         # Augmented enhanced score notes
         
-        escore_notes = TMIDIX.augment_enhanced_score_notes(escore_notes)
+        src_escore = TMIDIX.recalculate_score_timings(TMIDIX.augment_enhanced_score_notes([e for e in raw_escore if e[6] < 80]))
         
-        #===============================================================================
-        # Recalculate timings
+        src_cscore = TMIDIX.chordify_score([1000, src_escore])
+        
+        src_melody = [c[0] for c in src_cscore][:256]
+        
+        src_melody_pitches = [p[4] for p in src_melody]
+        
+        src_harm_tones_chords = TMIDIX.harmonize_enhanced_melody_score_notes(src_melody)
         
-        escore_notes = TMIDIX.recalculate_score_timings(escore_notes)
         #===============================================================================
-        # Add melody
         
-        output = TMIDIX.add_melody_to_enhanced_score_notes(escore_notes, 
-                                                           melody_channel=input_channel, 
-                                                           melody_patch=input_patch, 
-                                                           melody_start_chord=input_start_chord
-                                                          )
+        matched_songs = [a for a in all_songs if a[2] == max(32, len(src_melody))]
+        
+        
+        new_song = random.choice(matched_songs)
+        
+        if new_song:
+          print(new_song[0], TMIDIX.Number2patch[new_song[1]], new_song[2])
+        
+          trg_patch = new_song[1]
+        
+          trg_song = copy.deepcopy(new_song[3])
+          TMIDIX.adjust_score_velocities(trg_song, 95)
+        
+          cscore = TMIDIX.chordify_score([1000, trg_song])
         
         print('=' * 70)
-        print('Done!')
+        print('Done loading source and target MIDIs...!')
         print('=' * 70)
-        
+
         #===============================================================================
         print('Rendering results...')