update with next note

app.py

@@ -2,19 +2,27 @@ from interactive_pipe import interactive_pipeline, interactive, Control, Image
 from synthetizer import NOTE_FREQUENCIES, get_note
 from interactive_pipe.data_objects.audio import Audio
 from pathlib import Path
+from typing import Tuple
 from time import sleep
 import argparse
 import cv2
 import numpy as np
 
 
-def select_note(note="C4", context=None):
-    context["note"] = note
-    time_index = context.get("time_index", None)
-    if time_index is not None:
-        context["time_index"] += 1
-    else:
+SONG_1 = "au clair de la lune"
+SONG_2 = "ainsi font, font, font"
+
+
+def select_song(song: str = SONG_1, context={}):
+    previous_song = context.get("song", None)
+    if previous_song != song:
+        # reset time index
         context["time_index"] = 0
+    context["song"] = song
+
+
+def select_note(note="C4", context={}):
+    context["note"] = note
 
 
 def create_note(context={}):
@@ -32,15 +40,27 @@ def play_note(audio_signal: np.ndarray, context={}):
             sleep(0.01)
             print("waiting for file")
     assert file_name.exists()
-    context["__set_audio"](file_name)
-    context["__play"]()
+    if context["time_index"] == 0:
+        context["__stop"]()
+    else:
+        context["__set_audio"](file_name)
+        context["__play"]()
 
 
-def display_color(context={}):
+def display_current_color(context={}):
+    if context["time_index"] == 0:
+        return np.zeros((256, 256, 3))
     note = context.get("note", "C4")
     return get_color(note,  size=(256, 256))
 
 
+def display_next_color(context={}):
+    target_note = context.get("target_note", None)
+    if target_note is None:
+        return np.zeros((256, 256, 3))
+    return get_color(target_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()))}
@@ -85,26 +105,24 @@ def add_border(img, border_size=10, color=(0.2, 0.2, 0.2)):
     img[:, -border_size:] = color
 
 
+def increment_time(context: dict = {}) -> None:
+    time_index = context.get("time_index", None)
+    if time_index is not None:
+        context["time_index"] += 1
+    else:
+        context["time_index"] = 0
+
+
 def xylo_player():
-    select_note()
     select_song()
+    select_note()
     full_song = song_player()
     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 select_song(song: str = SONG_1, context={}):
-    previous_song = context.get("song", None)
-    if previous_song != song:
-        # reset time index
-        context["time_index"] = 0
-    context["song"] = song
+    # current_note = display_current_color()
+    target_note = display_next_color()
+    increment_time()
+    return [full_song, target_note]
 
 
 def song_player(context={}):
@@ -114,14 +132,18 @@ def song_player(context={}):
         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, current_time=context.get("time_index", 0))
+    image_song, target_note = generate_song(
+        song_str, current_time=context.get("time_index", 0))
+    context["target_note"] = target_note
+    return image_song
 
 
-def generate_song(song_str, current_time=None):
+def generate_song(song_str, current_time=None) -> Tuple[np.ndarray, str]:
     notes = song_str.split(" ")
     all_notes = []
     size = (64, 128)
     index_no_silence = -1
+    target_note = None
     for idx, note in enumerate(notes):
         if note in ["-", "."]:
             img_note = np.zeros((size[1], size[0], 3))
@@ -134,12 +156,13 @@ def generate_song(song_str, current_time=None):
                 continue
 
             img_note = get_color(note_classic, size=size)
-            color = (0.8, 0., 0.) if current_time == index_no_silence else (
-                0.2, 0.2, 0.2)
+            if current_time == index_no_silence:
+                target_note = note_classic
+                color = (0.8, 0., 0.)
+            else:
+                color = (0.2, 0.2, 0.2)
         add_border(img_note, color=color)
         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):
@@ -147,7 +170,7 @@ def generate_song(song_str, current_time=None):
     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
+    return out_image, target_note
 
 
 if __name__ == '__main__':

requirements.txt

@@ -1,2 +1,2 @@
-interactive-pipe>=0.8.1
+interactive-pipe>=0.8.2
 wavio