Parcourir la source

more speaker changes

Sanjay Govind il y a 10 mois
Parent
commit
02e6527197
2 fichiers modifiés avec 3 ajouts et 8 suppressions
  1. 3 7
      virtual_portal.c
  2. 0 1
      virtual_portal.h

+ 3 - 7
virtual_portal.c

@@ -408,12 +408,14 @@ int virtual_portal_send_status(VirtualPortal* virtual_portal, uint8_t* response)
 int virtual_portal_m(VirtualPortal* virtual_portal, uint8_t* message, uint8_t* response) {
     // Activate speaker for any non-zero value in the range 01-FF
     virtual_portal->speaker = (message[1] != 0);
+    virtual_portal->head = virtual_portal->tail = virtual_portal->audio_buffer;
     if (virtual_portal->speaker) {
         wav_player_speaker_start();
     } else {
         wav_player_speaker_stop();
+        virtual_portal->count = 0;
+        virtual_portal->head = virtual_portal->tail = virtual_portal->audio_buffer;
     }
-    virtual_portal->audio_in_buffer = false;
     /*
     char display[33] = {0};
     for(size_t i = 0; i < BLOCK_SIZE; i++) {
@@ -581,9 +583,6 @@ void virtual_portal_process_audio(
         if (++virtual_portal->head == virtual_portal->end) {
             virtual_portal->head = virtual_portal->current_audio_buffer;
         }
-        if (virtual_portal->count > SAMPLES_COUNT_BUFFERED) {
-            virtual_portal->audio_in_buffer = true;
-        }
     }
 }
 
@@ -642,9 +641,6 @@ void virtual_portal_process_audio_360(
         if (++virtual_portal->head == virtual_portal->end) {
             virtual_portal->head = virtual_portal->current_audio_buffer;
         }
-        if (virtual_portal->count > SAMPLES_COUNT_BUFFERED) {
-            virtual_portal->audio_in_buffer = true;
-        }
     }
 }
 

+ 0 - 1
virtual_portal.h

@@ -53,7 +53,6 @@ typedef struct {
     uint8_t sequence_number;
     float volume;
     bool playing_audio;
-    bool audio_in_buffer;
     uint8_t audio_buffer[SAMPLES_COUNT];
     uint8_t current_audio_buffer[SAMPLES_COUNT_BUFFERED];
     uint8_t* head;