update ip version, add songs

app.py

@@ -36,23 +36,34 @@ def display_color(context={}):
     return get_color(note,  size=(256, 256))
 
 
+NOTES_TRANSLATION = ["do", "re", "mi", "fa", "sol", "la", "si", "do2"]
+NOTES_CORRESPONDANCE = {
+    NOTES_TRANSLATION[i]: note for i, note in enumerate(list(NOTE_FREQUENCIES.keys()))}
+
+
 def get_color(note, size=(256, 256)):
     colors = {
         "red": (1.0, 0.0, 0.0),
         "orange": (1.0, 0.65, 0.0),
-        "yellow": (1.0, 1.0, 0.0),
+        "yellow": (0.9, 0.9, 0.0),
         "green": (0.0, 0.5, 0.0),
-        "blue": (0.0, 0.0, 1.0),
-        "dark blue": (0.0, 0.0, 0.55),
+        "cyan": (0.0, 0.7, 1.0),
+        "dark blue": (0.0, 0.0, 0.7),
         "purple": (0.5, 0.0, 0.5),
-        "pink": (1.0, 0.75, 0.8)
+        "pink": (1.0, 0.75, 0.8),
+
     }
-    notes_translation = ["DO", "RE", "MI", "FA", "SOL", "LA", "SI", "DO"]
     index = list(NOTE_FREQUENCIES.keys()).index(note)
     color = colors.get(list(colors.keys())[index], [0., 0., 0.])
     img = np.ones((size[1], size[0], 3)) * np.array(color)[None, None, :]
-    text = notes_translation[index]
-    font_scale = 4
+    border_size = 4
+    border_color = (0.2, 0.2, 0.2)
+    img[:border_size, :] = border_color
+    img[-border_size:, :] = border_color
+    img[:, :border_size] = border_color
+    img[:, -border_size:] = border_color
+    text = NOTES_TRANSLATION[index].upper()
+    font_scale = size[0] // 64
     thickness = 2
     text_size = cv2.getTextSize(
         text, cv2.FONT_HERSHEY_SIMPLEX, font_scale, thickness)[0]
@@ -62,16 +73,58 @@ def get_color(note, size=(256, 256)):
         img,
         text,
         (text_x, text_y),
-        cv2.FONT_HERSHEY_SIMPLEX, font_scale, (0, 0, 0), thickness
+        cv2.FONT_HERSHEY_SIMPLEX, font_scale, (255, 255, 255), thickness
     )
     return img
 
 
 def xylo_player():
+    full_song = song_player()
     select_note()
     audio = create_note()
     play_note(audio)
     out_image = display_color()
+    return [full_song, out_image]
+
+
+SONG_1 = "au clair de la lune"
+SONG_2 = "ainsi font, font, font"
+
+
+def song_player(song: str=SONG_1, context={}):
+    SONG = {
+        SONG_1: "fa fa fa sol la - sol - la sol sol fa - fa fa fa sol la",
+        SONG_2: "mi mi do - mi - sol - sol - la sol fa mi re mi do mi mi do - mi - sol - sol - la sol fa mi re do"
+    }
+    song_str = SONG.get(song, "")
+    return generate_song(song_str)
+
+
+def generate_song(song_str):
+    notes = song_str.split(" ")
+    all_notes = []
+    size = (64, 128)
+    for note in notes:
+        if note in ["-", "."]:
+            img_note = np.zeros((size[1], size[0], 3))
+        else:
+            note_classic = NOTES_CORRESPONDANCE.get(note, None)
+            if note_classic is None:
+                print(f"Note {note} not found")
+                continue
+            img_note = get_color(note_classic, size=size)
+        all_notes.append(img_note)
+
+    # out_image = np.hstack(all_notes)
+    max_notes_per_line = 12
+    remainder = max_notes_per_line - len(all_notes) % max_notes_per_line
+    for _ in range(remainder):
+        all_notes.append(np.zeros_like(all_notes[0]))
+    # out_image = np.hstack(all_notes)
+    # print(len(all_notes))
+    note_lines = [all_notes[i:i + max_notes_per_line]
+                  for i in range(0, len(all_notes), max_notes_per_line)]
+    out_image = np.vstack([np.hstack(line) for line in note_lines])
     return out_image
 
 
@@ -86,6 +139,9 @@ if __name__ == '__main__':
         img = get_color(note, size=(512, 512))
         Image.save_image(img, icon)
     interactive(note=Control("C4", all_notes, icons=icon_list))(select_note)
-
-    interactive_pipeline(gui=args.backend, cache=False,
-                         audio=True)(xylo_player)()
+    interactive(song=(SONG_1, [SONG_1, SONG_2]))(song_player)
+    interactive_pipeline(
+        gui=args.backend,
+        cache=False,
+        audio=True
+    )(xylo_player)()

requirements.txt

@@ -1,2 +1,2 @@
-interactive-pipe
+interactive-pipe>=0.8.0
 wavio