audition toggles playback

marchingband · Feb 2, 2022 · 089663b · 089663b
1 parent a92f700
commit 089663b
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 1 deletion.
diff --git a/src/rpc.c b/src/rpc.c
@@ -45,7 +45,7 @@ char* on_rpc_in(cJSON *json)
             uint8_t voice = cJSON_GetObjectItemCaseSensitive(json, "voice")->valueint;
             uint8_t note = cJSON_GetObjectItemCaseSensitive(json, "note")->valueint;
             uint8_t velocity = cJSON_GetObjectItemCaseSensitive(json, "velocity")->valueint;
-            play_wav(voice, note, velocity);
+            toggle_wav(voice, note, velocity);
             char * res = "started wav";
             return(res);
             break;

diff --git a/src/wav_player.c b/src/wav_player.c
@@ -235,6 +235,18 @@ int16_t IRAM_ATTR scale_sample_clamped_16(int in, uint8_t volume)
   return (int16_t)(out * lin_float_lut[volume].val);
 }
 
+bool is_playing(uint8_t voice, uint8_t note)
+{
+  for(int i=0;i<NUM_BUFFERS;i++)
+  {
+    if((bufs[i].free == false) && (bufs[i].wav_player_event.voice == voice) && (bufs[i].wav_player_event.note == note))
+    {
+      return true;
+    }
+  }
+  return false;
+}
+
 void stop_wav(uint8_t voice, uint8_t note)
 {
   struct wav_player_event_t wav_player_event;
@@ -256,6 +268,18 @@ void play_wav(uint8_t voice, uint8_t note, uint8_t velocity)
   xQueueSendToBack(wav_player_queue, &wav_player_event, portMAX_DELAY);
 }
 
+void toggle_wav(uint8_t voice, uint8_t note, uint8_t velocity)
+{
+  if(is_playing(voice, note))
+  {
+    stop_wav(voice, note);
+  }
+  else
+  {
+    play_wav(voice, note, velocity);
+  }
+}
+
 int prune(uint8_t priority)
 {
   int candidate = -1;