Support for IDF logger via USE_IDF_LOGGER

Author: pschatzmann

src/AudioConfig.h

@@ -59,7 +59,6 @@ typedef WiFiClient WiFiClientSecure;
 #include "AudioTools/CoreAudio/AudioRuntime.h"
 
 
-
 // If you don't want to use all the settings from here you can define your own local config settings in AudioConfigLocal.h
 #if __has_include("AudioConfigLocal.h") 
 #include "AudioConfigLocal.h"
@@ -270,6 +269,9 @@ typedef WiFiClient WiFiClientSecure;
 #  endif
 #  define USE_SD_SUPPORTS_SPI
 //#  define USE_ESP32_LOGGER true
+#  if !defined(ARDUINO)
+#    define USE_IDF_LOGGER
+#  endif
 #endif
 
 // ----- Regular ESP32 -----

src/AudioLogger.h

@@ -1,3 +1,2 @@
 #pragma once
-// added so that we can include the AudioLogger from Arduino w/o calling include "AudioTools.h" first.
-#include "AudioTools/CoreAudio/AudioLogger.h"
+#include "AudioTools/CoreAudio/AudioLogger.h"

src/AudioTools/AudioCodecs/AudioEncoded.h

@@ -135,7 +135,7 @@ class EncodedAudioOutput : public ModifyingOutput {
 
   /// Starts the processing - sets the status to active
   bool begin() override {
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.set();
 #endif
     TRACED();
@@ -150,7 +150,7 @@ class EncodedAudioOutput : public ModifyingOutput {
         LOGW("no decoder or encoder defined");
       }
     }
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.reset();
 #endif
     return active;
@@ -164,14 +164,14 @@ class EncodedAudioOutput : public ModifyingOutput {
 
   /// Ends the processing
   void end() override {
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.set();
 #endif
     TRACEI();
     decoder_ptr->end();
     encoder_ptr->end();
     active = false;
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.reset();
 #endif
   }
@@ -182,7 +182,7 @@ class EncodedAudioOutput : public ModifyingOutput {
       //LOGI("write: %d", 0);
       return 0;
     }
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.set();
 #endif
     LOGD("EncodedAudioOutput::write: %d", (int)len);
@@ -198,7 +198,7 @@ class EncodedAudioOutput : public ModifyingOutput {
 
     size_t result = writer_ptr->write(data, len);
     LOGD("EncodedAudioOutput::write: %d -> %d", (int)len, (int)result);
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.reset();
 #endif
     return result;
@@ -218,7 +218,7 @@ class EncodedAudioOutput : public ModifyingOutput {
   /// Provides the initialized encoder
   AudioEncoder &encoder() { return *encoder_ptr; }
 
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
   /// Defines the class specific custom log level
   void setLogLevel(AudioLogger::LogLevel level) { custom_log_level.set(level); }
 #endif
@@ -236,7 +236,7 @@ class EncodedAudioOutput : public ModifyingOutput {
   Print *ptr_out = nullptr;
   bool active = false;
   bool check_available_for_write = false;
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
   CustomLogLevel custom_log_level;
 #endif
   int frame_size = DEFAULT_BUFFER_SIZE;
@@ -376,7 +376,7 @@ class EncodedAudioStream : public ReformatBaseStream {
   float getByteFactor() { return byte_factor; }
   void setByteFactor(float factor) {byte_factor = factor;}
 
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
  /// Defines the class specific custom log level
   void setLogLevel(AudioLogger::LogLevel level) { enc_out.setLogLevel(level); }
 #endif

src/AudioTools/CoreAudio/AudioHttp/HttpHeader.h

@@ -100,8 +100,9 @@ class HttpHeader {
       LOGD("HttpHeader::put %s %s", key, value);
       HttpHeaderLine* hl = headerLine(key);
       if (hl == nullptr) {
-        if (create_new_lines)
+        if (create_new_lines){
           LOGE("HttpHeader::put - did not add HttpHeaderLine for %s", key);
+        }
         return *this;
       }
 

src/AudioTools/CoreAudio/AudioHttp/URLStream.h

@@ -103,7 +103,7 @@ class URLStream : public AbstractURLStream {
     total_read = 0;
     active = result == 200;
     LOGI("==> http status: %d", result);
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.reset();
 #endif
     return active;
@@ -129,7 +129,7 @@ class URLStream : public AbstractURLStream {
     total_read = 0;
     active = result == 200;
     LOGI("==> http status: %d", result);
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.reset();
 #endif
     return active;
@@ -260,7 +260,7 @@ class URLStream : public AbstractURLStream {
     return request.available() > 0;
   }
 
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
   /// Defines the class specific custom log level
   void setLogLevel(AudioLogger::LogLevel level) { custom_log_level.set(level); }
 #endif
@@ -275,7 +275,7 @@ class URLStream : public AbstractURLStream {
 
  protected:
   HttpRequest request;
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
   CustomLogLevel custom_log_level;
 #endif
   Str url_str;
@@ -305,7 +305,7 @@ class URLStream : public AbstractURLStream {
 
   bool preProcess(const char* urlStr, const char* acceptMime) {
     TRACED();
-#if USE_AUDIO_LOGGING
+#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
     custom_log_level.set();
 #endif
     url_str = urlStr;

src/AudioTools/CoreAudio/AudioI2S/I2SConfigESP32V1.h

@@ -94,19 +94,22 @@ class I2SConfigESP32V1 : public AudioInfo {
       // LOGI("buffer_count:%d",buffer_count);
       // LOGI("buffer_size:%d",buffer_size);
 
-      if (pin_mck!=-1)
+      if (pin_mck!=-1){
         LOGI("pin_mck: %d", pin_mck);
-      if (pin_bck!=-1)
+      }
+      if (pin_bck!=-1){
         LOGI("pin_bck: %d", pin_bck);
-      if (pin_ws!=-1)
+      }
+      if (pin_ws!=-1){
         LOGI("pin_ws: %d", pin_ws);
-      if (pin_data!=-1)
+      }
+      if (pin_data!=-1){
         LOGI("pin_data: %d", pin_data);
+      }
       if (pin_data_rx!=-1){
         LOGI("pin_data_rx: %d", pin_data_rx);
       }
     }
-
 };
 
 using I2SConfig = I2SConfigESP32V1;

src/AudioTools/CoreAudio/AudioIO.h

@@ -87,11 +87,13 @@ class TransformationReader {
         int read_eff = p_stream->readBytes(buffer.data(), buffer.size());
         if (read_eff > 0) {
           zero_count  = 0; // reset 0 count
-          if (read_eff != buffer.size())
+          if (read_eff != buffer.size()){
             LOGD("readBytes %d -> %d", buffer.size(), read_eff);
+          }
           int write_eff = p_transform->write(buffer.data(), read_eff);
-          if (write_eff != read_eff)
+          if (write_eff != read_eff){
             LOGE("write %d -> %d", read_eff, write_eff);
+          }
         } else {
           // limit the number of reads which provide 0;
           if (++zero_count > MAX_ZERO_READ_COUNT){