Finta sostituzione Serial con audioLogger

Author: Marco1971Repo

README.md

@@ -1,30 +1,39 @@
-# ESP8266Audio - supports ESP8266 & ESP32 & Raspberry Pi Pico RP2040 [![Gitter](https://badges.gitter.im/ESP8266Audio/community.svg)](https://gitter.im/ESP8266Audio/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
+# ESP8266Audio - supports ESP8266 & ESP32 & Raspberry Pi RP2040 [![Gitter](https://badges.gitter.im/ESP8266Audio/community.svg)](https://gitter.im/ESP8266Audio/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 Arduino library for parsing and decoding MOD, WAV, MP3, FLAC, MIDI, AAC, and RTTL files and playing them on an I2S DAC or even using a software-simulated delta-sigma DAC with dynamic 32x-128x oversampling.
 
 ESP8266 is fully supported and most mature, but ESP32 is also mostly there with built-in DAC as well as external ones.
 
 For real-time, autonomous speech synthesis, check out [ESP8266SAM](https://github.com/earlephilhower/ESP8266SAM), a library which uses this one and a port of an ancient format-based synthesis program to allow your ESP8266 to talk with low memory and no network required.
 
 ## Disclaimer
-All this code is released under the GPL, and all of it is to be used at your own risk.  If you find any bugs, please let me know via the GitHub issue tracker or drop me an email.
+All this code is released under the GPL, and all of it is to be used at your own risk.  If you find any bugs, please let me know via the GitHub issue tracker or drop me an email.  The MOD and MP3 routines were taken from StellaPlayer and libMAD respectively.  The software I2S delta-sigma 32x oversampling DAC was my own creation, and sounds quite good if I do say so myself.
 
-* The MOD and MP3 routines were taken from StellarPlayer and libMAD respectively.
-* The software I2S delta-sigma 32x oversampling DAC was my own creation, and sounds quite good if I do say so myself.
-* The AAC decode code is from the Helix project and licensed under RealNetwork's RSPL license.  For commercial use you're still going to need the usual AAC licensing from [Via Licensing](http://www.via-corp.com/us/en/licensing/aac/overview.html).  On the ESP32, AAC-SBR is supported (many webradio stations use this to reduce bandwidth even further).  The ESP8266, however, does not support it due to a lack of onboard RAM.
-* MIDI decoding comes from a highly ported [MIDITONES](https://github.com/LenShustek/miditones) combined with a massively memory-optimized [TinySoundFont](https://github.com/schellingb/TinySoundFont), see the respective source files for more information.
-* Opus, OGG, and OpusFile are from [Xiph.org](https://xiph.org) with the Xiph license and patent described in src/{opusfile,libggg,libopus}/COPYING..  **NOTE** Opus decoding currently only works on the ESP32 due to the large memory requirements of opusfile.  PRs to rewrite it to be less memory intensive would be much appreciated.
+The AAC decode code is from the Helix project and licensed under RealNetwork's RSPL license.  For commercial use you're still going to need the usual AAC licensing from [Via Licensing](http://www.via-corp.com/us/en/licensing/aac/overview.html).
+
+On the ESP32, AAC-SBR is supported (many webradio stations use this to reduce bandwidth even further).  The ESP8266, however, does not support it due to a lack of onboard RAM.
+
+MIDI decoding comes from a highly ported [MIDITONES](https://github.com/LenShustek/miditones) combined with a massively memory-optimized [TinySoundFont](https://github.com/schellingb/TinySoundFont), see the respective source files for more information.
+
+Opus, OGG, and OpusFile are from [Xiph.org](https://xiph.org) with the Xiph license and patent described in src/{opusfile,libggg,libopus}/COPYING..  **NOTE** Opus decoding currently only works on the ESP32 due to the large memory requirements of opusfile.  PRs to rewrite it to be less memory intensive would be much appreciated.
 
 ## Neat Things People Have Done With ESP8266Audio
 If you have a neat use for this library, [I'd love to hear about it](mailto:[email protected])!
 
-* My personal use of the ESP8266Audio library is only to drive a 3D-printed, network-time-setting alarm clock for my kids which can play an MP3 instead of a bell to wake them up, called [Psychoclock](https://github.com/earlephilhower/psychoclock).
-* Harald Sattler has built a neat German [word clock with MP3 alarm](http://www.harald-sattler.de/html/mini-wecker.htm). Detailed discussion on the process and models are included.
-* Erich Heinemann has developed a Stomper (instrument for playing samples in real-time during a live stage performance) that you can find more info about [here](https://github.com/ErichHeinemann/hman-stomper).
-* Dagnall53 has integrated this into a really neat MQTT based model train controller to add sounds to his set.  More info is available [here](https://github.com/dagnall53/ESPMQTTRocnetSound), including STL files for 3D printed components!
-* JohannesMTC has built a similar project especially for model trains: https://github.com/JohannesMTC/ESP32_MAS
-* A neat MQTT-driven ESP8266 light-and-sound device (alarm? toy? who can say!) was built by @CosmicMac, available at https://github.com/CosmicMac/ESParkle
-* A very interesting "linear clock" with a stepper motor, NTP time keeping, and configurable recorded chimes with schematics, 3D printer plans, and source code, is now available https://janderogee.com/projects/linear_clock/linear_clock.htm
-* Source and instructions for a gorgeous wooden MP3-playing clock, FM radio and a walkie-talkie using the ESP8266 and AVR microcontrollers is available https://github.com/zduka/mp3-player
+My personal use of the ESP8266Audio library is only to drive a 3D-printed, network-time-setting alarm clock for my kids which can play an MP3 instead of a bell to wake them up, called [Psychoclock](https://github.com/earlephilhower/psychoclock).
+
+Harald Sattler has built a neat German [word clock with MP3 alarm](http://www.harald-sattler.de/html/mini-wecker.htm). Detailed discussion on the process and models are included.
+
+Erich Heinemann has developed a Stomper (instrument for playing samples in real-time during a live stage performance) that you can find more info about [here](https://github.com/ErichHeinemann/hman-stomper).
+
+Dagnall53 has integrated this into a really neat MQTT based model train controller to add sounds to his set.  More info is available [here](https://github.com/dagnall53/ESPMQTTRocnetSound), including STL files for 3D printed components!
+
+JohannesMTC has built a similar project especially for model trains: https://github.com/JohannesMTC/ESP32_MAS
+
+A neat MQTT-driven ESP8266 light-and-sound device (alarm? toy? who can say!) was built by @CosmicMac, available at https://github.com/CosmicMac/ESParkle
+
+A very interesting "linear clock" with a stepper motor, NTP time keeping, and configurable recorded chimes with schematics, 3D printer plans, and source code, is now available https://janderogee.com/projects/linear_clock/linear_clock.htm
+
+Source and instructions for a gorgeous wooden MP3-playing clock, FM radio and a walkie-talkie using the ESP8266 and AVR microcontrollers is available https://github.com/zduka/mp3-player
 
 ## Prerequisites
 First, make sure you are running the 2.6.3/later or GIT head version of the Arduino libraries for ESP8266, or the latest ESP32 SDK from Espressif.
@@ -256,11 +265,10 @@ I've been told the Wemos SD card shield uses GPIO15 as the SD chip select.  This
 There's no ESP8266-specific code in the AudioGenerator routines, so porting to other controllers should be relatively easy assuming they have the same endianness as the Xtensa core used.  Drop me a line if you're doing this, I may be able to help point you in the right direction.
 
 ## Thanks
-Thanks to the authors of StellarPlayer and libMAD for releasing their code freely, and to the maintainers and contributors to the ESP8266 Arduino port.
+Thanks to the authors of StellaPlayer and libMAD for releasing their code freely, and to the maintainers and contributors to the ESP8266 Arduino port.
 
 Also, big thanks to @tueddy for getting the initial ESP32 porting into the tree!
 
 -Earle F. Philhower, III
-
  [email protected]
 

examples/PlayMIDIFromSPIFFS/PlayMIDIFromSPIFFS.ino

@@ -2,7 +2,7 @@
 
 // Do not build on GCC8, GCC8 has a compiler bug
 
-#if defined(ARDUINO_ARCH_RP2040) || ((__GNUC__ == 8) && (__XTENSA__))
+#if defined(ARDUINO_ARCH_RP2040) || (__GNUC__ == 8)
 void setup() {}
 void loop() {}
 #else

keywords.txt

@@ -23,7 +23,6 @@ AudioOutput	KEYWORD1
 AudioOutputI2S	KEYWORD1
 AudioOutputI2SNoDAC	KEYWORD1
 AudioOutputI2SClass	KEYWORD1
-AudioOutputPWM	KEYWORD1
 AudioOutputNull	KEYWORD1
 AudioOutputBuffer	KEYWORD1
 AudioOutputSerialWAV	KEYWORD1

src/AudioFileSourceICYStream.cpp

@@ -128,7 +128,7 @@ uint32_t AudioFileSourceICYStream::readInternal(void *data, uint32_t len, bool n
   size_t avail = stream->available();
   if (!nonBlock && !avail) {
     cb.st(STATUS_NODATA, PSTR("No stream data available"));
-    http.end();
+     http.end();
     goto retry;
   }
   if (avail == 0) return 0;

src/AudioGeneratorAAC.cpp

@@ -35,13 +35,13 @@ AudioGeneratorAAC::AudioGeneratorAAC()
   outSample = (int16_t*)malloc(1024 * 2 * sizeof(uint16_t));
   if (!buff || !outSample) {
     audioLogger->printf_P(PSTR("ERROR: Out of memory in AAC\n"));
-    Serial.flush();
+    audioLogger->flush();
   }
 
   hAACDecoder = AACInitDecoder();
   if (!hAACDecoder) {
     audioLogger->printf_P(PSTR("Out of memory error! hAACDecoder==NULL\n"));
-    Serial.flush();
+    audioLogger->flush();
   }
 
   buffValid = 0;
@@ -75,7 +75,7 @@ AudioGeneratorAAC::AudioGeneratorAAC(void *preallocateData, int preallocateSz)
   hAACDecoder = AACInitDecoderPre(p, availSpace);
   if (!hAACDecoder) {
     audioLogger->printf_P(PSTR("Out of memory error! hAACDecoder==NULL\n"));
-    Serial.flush();
+    audioLogger->flush();
   }
   buffValid = 0;
   lastFrameEnd = 0;

src/AudioGeneratorMIDI.cpp

@@ -58,7 +58,7 @@
 
 #include "AudioGeneratorMIDI.h"
 
-#if (__GNUC__ == 8) && (__XTENSA__)
+#if __GNUC__ == 8
 // Do not build, GCC8 has a compiler bug
 #else // __GNUC__ == 8
 

src/AudioGeneratorMIDI.h

@@ -21,7 +21,7 @@
 #ifndef _AUDIOGENERATORMIDI_H
 #define _AUDIOGENERATORMIDI_H
 
-#if (__GNUC__ == 8) && (__XTENSA__)
+#if __GNUC__ == 8
 // Do not build, GCC8 has a compiler bug
 #else // __GNUC__ == 8
 

src/AudioGeneratorMP3.cpp

@@ -248,10 +248,6 @@ bool AudioGeneratorMP3::loop()
       running = false;
       goto done;
     }
-    if (lastChannels == 1)
-    {
-      lastSample[1] = lastSample[0];
-    }
   } while (running && output->ConsumeSample(lastSample));
 
 done:
@@ -388,7 +384,7 @@ extern "C" {
       if (freeheap < 1024) {
         audioLogger->printf_P(PSTR("out of heap!\n"));
       }
-      Serial.flush();
+      audioLogger->flush();
       laststack = freestack;
       lastheap = freeheap;
     }

src/AudioGeneratorMP3a.cpp

@@ -31,7 +31,7 @@ AudioGeneratorMP3a::AudioGeneratorMP3a()
   hMP3Decoder = MP3InitDecoder();
   if (!hMP3Decoder) {
     audioLogger->printf_P(PSTR("Out of memory error! hMP3Decoder==NULL\n"));
-    Serial.flush();
+    audioLogger->flush();
   }
   // For sanity's sake...
   memset(buff, 0, sizeof(buff));