diff --git a/library.properties b/library.properties index 6d9baa4..3fb30ef 100644 --- a/library.properties +++ b/library.properties @@ -1,5 +1,5 @@ name=ESP8266Audio -version=1.1.3 +version=1.1.4 author=Earle F. Philhower, III maintainer=Earle F. Philhower, III sentence=Audio file and I2S sound playing routines. diff --git a/src/AudioFileSourceBuffer.cpp b/src/AudioFileSourceBuffer.cpp index 888944d..08b8292 100644 --- a/src/AudioFileSourceBuffer.cpp +++ b/src/AudioFileSourceBuffer.cpp @@ -162,7 +162,7 @@ void AudioFileSourceBuffer::fill() int cnt = src->readNonBlock(&buffer[writePtr], bytesAvailEnd); length += cnt; writePtr = (writePtr + cnt) % buffSize; - if (cnt != bytesAvailEnd) return; + if (cnt != (int)bytesAvailEnd) return; } if (readPtr > 1) { diff --git a/src/AudioFileSourceHTTPStream.cpp b/src/AudioFileSourceHTTPStream.cpp index d87ec4f..0506c7b 100644 --- a/src/AudioFileSourceHTTPStream.cpp +++ b/src/AudioFileSourceHTTPStream.cpp @@ -37,7 +37,7 @@ AudioFileSourceHTTPStream::AudioFileSourceHTTPStream(const char *url) bool AudioFileSourceHTTPStream::open(const char *url) { pos = 0; - http.begin(url); + http.begin(client, url); http.setReuse(true); int code = http.GET(); if (code != HTTP_CODE_OK) { diff --git a/src/AudioFileSourceHTTPStream.h b/src/AudioFileSourceHTTPStream.h index b483e95..e7ef88d 100644 --- a/src/AudioFileSourceHTTPStream.h +++ b/src/AudioFileSourceHTTPStream.h @@ -52,6 +52,7 @@ class AudioFileSourceHTTPStream : public AudioFileSource private: virtual uint32_t readInternal(void *data, uint32_t len, bool nonBlock); + WiFiClient client; HTTPClient http; int pos; int size; diff --git a/src/AudioFileSourceICYStream.cpp b/src/AudioFileSourceICYStream.cpp index 7822878..fdf70f2 100644 --- a/src/AudioFileSourceICYStream.cpp +++ b/src/AudioFileSourceICYStream.cpp @@ -38,7 +38,7 @@ bool AudioFileSourceICYStream::open(const char *url) { static const char *hdr[] = { "icy-metaint" }; pos = 0; - http.begin(url); + http.begin(client, url); http.addHeader("Icy-MetaData", "1"); http.collectHeaders( hdr, 1 ); http.setReuse(true); diff --git a/src/AudioGeneratorMOD.cpp b/src/AudioGeneratorMOD.cpp index c9b3ebd..e9c0928 100644 --- a/src/AudioGeneratorMOD.cpp +++ b/src/AudioGeneratorMOD.cpp @@ -17,6 +17,7 @@ You should have received a copy of the GNU General Public License along with this program. If not, see . */ +#define PGM_READ_UNALIGNED 0 #include "AudioGeneratorMOD.h" diff --git a/src/libflac/config.h b/src/libflac/config.h index a5fd247..a3fc8e4 100644 --- a/src/libflac/config.h +++ b/src/libflac/config.h @@ -1,3 +1,5 @@ +#define PGM_READ_UNALIGNED 0 + /* config.h. Generated from config.h.in by configure. */ /* config.h.in. Generated from configure.ac by autoheader. */ diff --git a/src/libflac/crc.c b/src/libflac/crc.c index 2c71cec..1b531e3 100644 --- a/src/libflac/crc.c +++ b/src/libflac/crc.c @@ -33,6 +33,7 @@ //#ifdef HAVE_CONFIG_H # include "config.h" //#endif +#define PGM_READ_UNALIGNED 0 #include #include diff --git a/src/libflac/private/crc.h b/src/libflac/private/crc.h index 684137c..0491b9e 100644 --- a/src/libflac/private/crc.h +++ b/src/libflac/private/crc.h @@ -33,6 +33,8 @@ #ifndef FLAC__PRIVATE__CRC_H #define FLAC__PRIVATE__CRC_H +#define PGM_READ_UNALIGNED 0 + #include #include "../FLAC/ordinals.h" diff --git a/src/libhelix-mp3/huffman.c b/src/libhelix-mp3/huffman.c index 70588b8..7d9d3f1 100644 --- a/src/libhelix-mp3/huffman.c +++ b/src/libhelix-mp3/huffman.c @@ -42,6 +42,7 @@ **************************************************************************************/ #include "coder.h" +#define PGM_READ_UNALIGNED 0 // Only support aligned reads, faster #include /* helper macros - see comments in hufftabs.c about the format of the huffman tables */