Pass sample object and use default sample level

Author: relic-se

circuitpython/perc/code.py

@@ -17,6 +17,8 @@
 
 # Settings
 
+LEVEL = 0.25  # Use `SAMPLES[notenum]["level"]` to override
+
 ## Velocity is 0->127
 HARD = 100
 SOFT = 0  # Adjust to act as gate
@@ -27,67 +29,59 @@
             HARD: "kick_hard",
             SOFT: "kick_soft"
         },
-        "level": 0.25
+        "level": 0.3
     },
     38: {
         "samples": {
             HARD: "snare_hard",
             SOFT: "snare_soft"
         },
-        "level": 0.25
+        "level": 0.3
     },
     41: {
         "samples": {
             HARD: "tom_lo_hard",
             SOFT: "tom_lo_soft"
-        },
-        "level": 0.25
+        }
     },
     42: {
         "samples": {
             SOFT: "hihat_closed"
-        },
-        "level": 0.25
+        }
     },
     43: {
         "samples": {
             HARD: "tom_mid_hard",
             SOFT: "tom_mid_soft"
-        },
-        "level": 0.25
+        }
     },
     44: {
         "samples": {
             SOFT: "hihat_pedal"
-        },
-        "level": 0.25
+        }
     },
     45: {
         "samples": {
             HARD: "tom_hi_hard",
             SOFT: "tom_hi_soft"
-        },
-        "level": 0.25
+        }
     },
     46: {
         "samples": {
             SOFT: "hihat_open"
-        },
-        "level": 0.25
+        }
     },
     49: {
         "samples": {
             HARD: "crash_hard",
             SOFT: "crash_soft"
-        },
-        "level": 0.25
+        }
     },
     51: {
         "samples": {
             HARD: "ride_hard",
             SOFT: "ride_soft"
-        },
-        "level": 0.25
+        }
     }
 }
 
@@ -111,23 +105,29 @@
     mixer.voice[i].play(wav)
     mixer.voice[i].level = 0.0
 
-def get_sample(notenum:int, velocity:int = 127) -> tuple[str, float]:
+def get_sample(notenum:int, velocity:int = 127) -> tuple[str, float]|None:
     if notenum in SAMPLES:
-        for vel, name in SAMPLES[notenum]["samples"].items():
+        sample = SAMPLES[notenum].copy()
+        for vel, name in sample["samples"].items():
             if velocity >= vel:
-                return (name, SAMPLES[notenum]["level"])
+                sample["name"] = name
+                del sample["samples"]
+                return sample
     return None
 
-def play_sample(name:str, level:float = 0.25) -> None:
+def get_sample_index(name:str) -> int|None:
+    try:
+        return list(samples.keys()).index(name)
+    except ValueError:
+        return None
+
+def play_sample(sample:dict) -> None:
     global samples
-    if name in samples:
-        i = 0
-        for val, wav in samples.items():
-            if val == name:
-                mixer.voice[i].level = level
-                mixer.voice[i].play(wav)
-                break
-            i += 1
+    if "name" in sample and sample["name"] in samples:
+        i = get_sample_index(sample["name"])
+        wav = samples[sample["name"]]
+        mixer.voice[i].level = sample.get("level", LEVEL)
+        mixer.voice[i].play(wav)
 
 def stop_sample(name:str) -> None:
     global samples
@@ -142,10 +142,9 @@ def stop_sample(name:str) -> None:
 async def touch_handler():
     while True:
         for event in hardware.check_touch():
-            if (notenum := event.key_number + 36) in SAMPLES:
-                name, level = get_sample(notenum)
+            if (notenum := event.key_number + 36) in SAMPLES and (sample := get_sample(notenum)):
                 if event.pressed:
-                    play_sample(name, level)
+                    play_sample(sample)
                 elif event.released:
                     pass
                     # stop_sample(name)
@@ -160,10 +159,9 @@ async def midi_handler():
     while True:
         for midi in (hardware.midi_uart, hardware.midi_usb):
             msg = midi.receive()
-            if isinstance(msg, (NoteOn, NoteOff)) and msg.note in SAMPLES:
-                name, level = get_sample(msg.note, msg.velocity)
+            if isinstance(msg, (NoteOn, NoteOff)) and msg.note in SAMPLES and (sample := get_sample(msg.note, msg.velocity)):
                 if isinstance(msg, NoteOn) and msg.velocity != 0:
-                    play_sample(name, level)
+                    play_sample(sample)
                 elif isinstance(msg, NoteOff) or (isinstance(msg, NoteOn) and msg.velocity == 0):
                     pass
                     # stop_sample(name)