Skip to content

Commit a50e846

Browse files
committed
Syntax Error #1054
1 parent cf1f2cb commit a50e846

File tree

2 files changed

+4
-21
lines changed

2 files changed

+4
-21
lines changed

src/Audio.cpp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@
33
audio.cpp
44
55
Created on: Oct 28.2018 */char audioI2SVers[] ="\
6-
Version 3.3.0d ";
7-
/* Updated on: Jun 02.2025
6+
Version 3.3.0e ";
7+
/* Updated on: Jun 03.2025
88
99
Author: Wolle (schreibfaul1)
1010
Audio library for ESP32, ESP32-S3 or ESP32-P4

src/Audio.h

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -21,17 +21,9 @@
2121
#include <atomic>
2222
#include <codecvt>
2323
#include <locale>
24-
25-
#if ESP_ARDUINO_VERSION_MAJOR >= 3
2624
#include <NetworkClient.h>
2725
#include <NetworkClientSecure.h>
28-
#endif
29-
30-
#if ESP_IDF_VERSION_MAJOR == 5
3126
#include <driver/i2s_std.h>
32-
#else
33-
#include <driver/i2s.h>
34-
#endif
3527

3628
#ifndef I2S_GPIO_UNUSED
3729
#define I2S_GPIO_UNUSED -1 // = I2S_PIN_NO_CHANGE in IDF < 5
@@ -184,12 +176,6 @@ class Audio : private AudioBuffer{
184176

185177
private:
186178

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-
193179
enum : int8_t { AUDIOLOG_PATH_IS_NULL = -1, AUDIOLOG_FILE_NOT_FOUND = -2, AUDIOLOG_OUT_OF_MEMORY = -3, AUDIOLOG_FILE_READ_ERR = -4,
194180
AUDIOLOG_M4A_ATOM_NOT_FOUND = -5, AUDIOLOG_ERR_UNKNOWN = -127 };
195181

@@ -618,14 +604,11 @@ uint64_t bigEndian(uint8_t* base, uint8_t numBytes, uint8_t shiftLeft = 8) {
618604

619605
#pragma GCC diagnostic push
620606
#pragma GCC diagnostic ignored "-Wmissing-field-initializers"
621-
#if ESP_IDF_VERSION_MAJOR == 5
607+
622608
i2s_chan_handle_t m_i2s_tx_handle = {};
623609
i2s_chan_config_t m_i2s_chan_cfg = {}; // stores I2S channel values
624610
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+
629612
#pragma GCC diagnostic pop
630613

631614
std::vector<char*> m_playlistContent; // m3u8 playlist buffer

0 commit comments

Comments
 (0)