Update app.py

app.py

@@ -29,12 +29,12 @@ def pitches_counts(melody_score):
   pcounts = []
 
   count = 0
-  pp = pitches[0]
+  pp = -1
     
   for p in pitches:
     if p == pp:
-      pcounts.append(count)
       count += 1
+      pcounts.append(count)
     else:
       count = 0
       pcounts.append(count)
@@ -73,7 +73,7 @@ def find_similar_song(songs, src_melody):
 
 # =================================================================================================
 
-def mix_chord(chord, tones_chord, mel_patch, mel_pitch):
+def mix_chord(chord, tones_chord, mel_patch, mel_pitch, next_note_dtime):
 
   cho = []
 
@@ -81,10 +81,14 @@ def mix_chord(chord, tones_chord, mel_patch, mel_pitch):
 
     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:
@@ -98,9 +102,15 @@ def mix_chord(chord, tones_chord, mel_patch, mel_pitch):
           tchord = tones_chord + [random.choice(tones_chord) for _ in range(len(cg)-tclen)]
 
         for i, cc in enumerate(cg):
+            
           c = copy.deepcopy(cc)
+            
+          if cc[2] > next_note_dtime:
+              cc[2] == next_note_dtime
+              
           c[4] = ((c[4] // 12) * 12) + tchord[i]
           c[5] += c[4] % 12
+            
           cho.append(c)
 
     else:
@@ -187,19 +197,26 @@ def MixMelody(input_midi, input_find_best_match):
         
         midx = 0
         
-        for c in cscore:
+        for i, c in enumerate(cscore):
             cho = copy.deepcopy(c)
             
             patches = sorted(set([e[6] for e in c]))
             
             if trg_patch in patches:
+
+                if midx < len(src_melody):
+                    next_note_dtime = src_melody[midx+1][1] - src_melody[midx][1]
                 
-                mixed_song.extend(mix_chord(c, src_harm_tones_chords[midx], trg_patch, src_melody_pitches[midx]))
+                mixed_song.extend(mix_chord(c, src_harm_tones_chords[midx], trg_patch, src_melody_pitches[midx], next_note_dtime))
                 
                 midx += 1
             
             else:
-                mixed_song.extend(mix_chord(cho, src_harm_tones_chords[midx], trg_patch, src_melody_pitches[midx]))
+
+                if i < len(cscore)
+                    next_note_dtime = cscore[i+1][0][1] - cscore[i][0][1]
+                
+                mixed_song.extend(mix_chord(cho, src_harm_tones_chords[midx], trg_patch, src_melody_pitches[midx], next_note_dtime))
 
             if midx == len(src_melody):
                 break