i2s_zero_dma_buffer() in IDF < V5 only

Author: schreibfaul1

src/Audio.cpp

@@ -1,12 +1,10 @@
-#include "esp_arduino_version.h"
-#include "assert.h"
 /*
  * Audio.cpp
  *
  *  Created on: Oct 26.2018
  *
- *  Version 3.0.7y
- *  Updated on: Dec 15.2023
+ *  Version 3.0.7z
+ *  Updated on: Dec 16.2023
  *      Author: Wolle (schreibfaul1)
  *
  */
@@ -230,6 +228,7 @@ Audio::Audio(bool internalDAC /* = false */, uint8_t channelEnabled /* = I2S_SLO
         i2s_driver_install((i2s_port_t)m_i2s_num, &m_i2s_config, 0, NULL);
         m_f_forceMono = false;
     }
+    i2s_zero_dma_buffer((i2s_port_t) m_i2s_num);
 
 #endif // ESP_IDF_VERSION_MAJOR == 5
     for(int i = 0; i < 3; i++) {
@@ -240,7 +239,7 @@ Audio::Audio(bool internalDAC /* = false */, uint8_t channelEnabled /* = I2S_SLO
         m_filter[i].b2 = 0;
     }
     computeLimit();  // first init, vol = 21, vol_steps = 21
-    i2s_zero_dma_buffer((i2s_port_t) m_i2s_num);
+    
 }
 //---------------------------------------------------------------------------------------------------------------------
 void Audio::setBufsize(int rambuf_sz, int psrambuf_sz) {
@@ -2112,7 +2111,7 @@ uint32_t Audio::stopSong() {
         log_w("Closing audio file");  // for debug
     }
     memset(m_outBuff, 0, 2048 * 2 * sizeof(uint16_t));  // Clear OutputBuffer
-                                                        //     i2s_zero_dma_buffer((i2s_port_t) m_i2s_num);
+    m_validSamples = 0;
     return pos;
 }
 //---------------------------------------------------------------------------------------------------------------------
@@ -2123,9 +2122,8 @@ bool Audio::pauseResume() {
         m_f_running = !m_f_running;
         retVal = true;
         if(!m_f_running) {
-            memset(m_outBuff, 0,
-                   2048 * 2 * sizeof(uint16_t));  // Clear OutputBuffer
-                                                  //             i2s_zero_dma_buffer((i2s_port_t) m_i2s_num);
+            memset(m_outBuff, 0, 2048 * 2 * sizeof(uint16_t));  // Clear OutputBuffer
+            m_validSamples = 0;
         }
     }
     xSemaphoreGive(mutex_audio);
@@ -4661,6 +4659,8 @@ bool Audio::setFilePos(uint32_t pos) {
     if(pos < m_audioDataStart) pos = m_audioDataStart;  // issue #96
     if(pos > m_file_size) pos = m_file_size;
     m_resumeFilePos = pos;
+    memset(m_outBuff, 0, 2048 * 2 * sizeof(int16_t));
+    m_validSamples = 0;
     return true;
 }
 //---------------------------------------------------------------------------------------------------------------------

src/Audio.h

@@ -3,8 +3,8 @@
  *
  *  Created on: Oct 28,2018
  *
- *  Version 3.0.7y
- *  Updated on: Dec 15.2023
+ *  Version 3.0.7z
+ *  Updated on: Dec 16.2023
  *      Author: Wolle (schreibfaul1)
  */
 
@@ -142,7 +142,7 @@ class Audio : private AudioBuffer{
     bool setFilePos(uint32_t pos);
     bool audioFileSeek(const float speed);
     bool setTimeOffset(int sec);
-    bool setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT, int8_t MCK = I2S_GPIO_UNUSED);
+    bool setPinout(uint8_t BCLK, uint8_t LRC, uint8_t DOUT, int8_t MCLK = I2S_GPIO_UNUSED);
     bool pauseResume();
     bool isRunning() {return m_f_running;}
     void loop();