|
21 | 21 | #include <atomic> |
22 | 22 | #include <codecvt> |
23 | 23 | #include <locale> |
24 | | - |
25 | | -#if ESP_ARDUINO_VERSION_MAJOR >= 3 |
26 | 24 | #include <NetworkClient.h> |
27 | 25 | #include <NetworkClientSecure.h> |
28 | | -#endif |
29 | | - |
30 | | -#if ESP_IDF_VERSION_MAJOR == 5 |
31 | 26 | #include <driver/i2s_std.h> |
32 | | -#else |
33 | | -#include <driver/i2s.h> |
34 | | -#endif |
35 | 27 |
|
36 | 28 | #ifndef I2S_GPIO_UNUSED |
37 | 29 | #define I2S_GPIO_UNUSED -1 // = I2S_PIN_NO_CHANGE in IDF < 5 |
@@ -184,12 +176,6 @@ class Audio : private AudioBuffer{ |
184 | 176 |
|
185 | 177 | private: |
186 | 178 |
|
187 | | - #ifndef ESP_ARDUINO_VERSION_VAL |
188 | | - #define ESP_ARDUINO_VERSION_MAJOR 0 |
189 | | - #define ESP_ARDUINO_VERSION_MINOR 0 |
190 | | - #define ESP_ARDUINO_VERSION_PATCH 0 |
191 | | - #endif |
192 | | - |
193 | 179 | enum : int8_t { AUDIOLOG_PATH_IS_NULL = -1, AUDIOLOG_FILE_NOT_FOUND = -2, AUDIOLOG_OUT_OF_MEMORY = -3, AUDIOLOG_FILE_READ_ERR = -4, |
194 | 180 | AUDIOLOG_M4A_ATOM_NOT_FOUND = -5, AUDIOLOG_ERR_UNKNOWN = -127 }; |
195 | 181 |
|
@@ -618,14 +604,11 @@ uint64_t bigEndian(uint8_t* base, uint8_t numBytes, uint8_t shiftLeft = 8) { |
618 | 604 |
|
619 | 605 | #pragma GCC diagnostic push |
620 | 606 | #pragma GCC diagnostic ignored "-Wmissing-field-initializers" |
621 | | -#if ESP_IDF_VERSION_MAJOR == 5 |
| 607 | + |
622 | 608 | i2s_chan_handle_t m_i2s_tx_handle = {}; |
623 | 609 | i2s_chan_config_t m_i2s_chan_cfg = {}; // stores I2S channel values |
624 | 610 | i2s_std_config_t m_i2s_std_cfg = {}; // stores I2S driver values |
625 | | -#else |
626 | | - i2s_config_t m_i2s_config = {}; |
627 | | - i2s_pin_config_t m_pin_config = {}; |
628 | | -#endif |
| 611 | + |
629 | 612 | #pragma GCC diagnostic pop |
630 | 613 |
|
631 | 614 | std::vector<char*> m_playlistContent; // m3u8 playlist buffer |
|
0 commit comments