Desktop build errors / remove custom_log_level

pschatzmann · pschatzmann · commit 4d6f5e1bcf19 · 2025-03-23T23:49:32.000+01:00
diff --git a/src/AudioTools/AudioCodecs/AudioEncoded.h b/src/AudioTools/AudioCodecs/AudioEncoded.h
@@ -2,7 +2,7 @@
 
 #include "AudioCodecsBase.h"
 #include "AudioToolsConfig.h"
-#include "AudioLogger.h"
+#include "AudioTools/CoreAudio/AudioLogger.h"
 #include "AudioTools/CoreAudio/AudioIO.h"
 #include "AudioTools/CoreAudio/AudioOutput.h"
 #include "AudioTools/CoreAudio/AudioStreams.h"
@@ -135,9 +135,6 @@ class EncodedAudioOutput : public ModifyingOutput {
 
   /// Starts the processing - sets the status to active
   bool begin() override {
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.set();
-#endif
     TRACED();
     if (!active) {
       TRACED();
@@ -150,9 +147,6 @@ class EncodedAudioOutput : public ModifyingOutput {
         LOGW("no decoder or encoder defined");
       }
     }
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.reset();
-#endif
     return active;
   }
 
@@ -165,16 +159,10 @@ class EncodedAudioOutput : public ModifyingOutput {
   /// Ends the processing
   void end() override {
     if (active) {
-#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 && !defined(USE_IDF_LOGGER)
-      custom_log_level.reset();
-#endif
     }
   }
 
@@ -184,9 +172,6 @@ class EncodedAudioOutput : public ModifyingOutput {
       // LOGI("write: %d", 0);
       return 0;
     }
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.set();
-#endif
     LOGD("EncodedAudioOutput::write: %d", (int)len);
 
     if (writer_ptr == nullptr || data == nullptr) {
@@ -200,9 +185,6 @@ 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 && !defined(USE_IDF_LOGGER)
-    custom_log_level.reset();
-#endif
     return result;
   }
 
@@ -220,10 +202,6 @@ class EncodedAudioOutput : public ModifyingOutput {
   /// Provides the initialized encoder
   AudioEncoder &encoder() { return *encoder_ptr; }
 
-#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
   /// Is Available for Write check activated ?
   bool isCheckAvailableForWrite() { return check_available_for_write; }
 
@@ -238,9 +216,6 @@ class EncodedAudioOutput : public ModifyingOutput {
   Print *ptr_out = nullptr;
   bool active = false;
   bool check_available_for_write = false;
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-  CustomLogLevel custom_log_level;
-#endif
   int frame_size = DEFAULT_BUFFER_SIZE;
 };
 
@@ -372,11 +347,6 @@ class EncodedAudioStream : public ReformatBaseStream {
   float getByteFactor() { return byte_factor; }
   void setByteFactor(float factor) { byte_factor = factor; }
 
-#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
-
   /// defines the size of the decoded frame in bytes
   void setFrameSize(int size) { enc_out.setFrameSize(size); }
 
diff --git a/src/AudioTools/AudioLibs/Desktop/File.h b/src/AudioTools/AudioLibs/Desktop/File.h
@@ -1,12 +1,13 @@
 #pragma once
 #define VFS_SD SD
 #include "AudioTools/Disk/VFSFile.h"
+#include "AudioTools/Disk/VFS.h"
 
 // We allow the access to the files via the global SD object
 
 namespace audio_tools {
 
 using File = VFSFile;
-using FS = VFS_SDClass;
+using FS = VFS;
     
 }
diff --git a/src/AudioTools/AudioLibs/HLSStream.h b/src/AudioTools/AudioLibs/HLSStream.h
@@ -220,7 +220,6 @@ class HLSParser {
 
   bool begin() {
     TRACEI();
-    custom_log_level.set();
     segments_url_str = "";
     bandwidth = 0;
 
@@ -245,29 +244,24 @@ class HLSParser {
       return false;
     }
 
-    custom_log_level.reset();
     return true;
   }
 
   int available() {
     TRACED();
     int result = 0;
-    custom_log_level.set();
     reloadSegments();
 
     if (active) result = url_loader.available();
-    custom_log_level.reset();
     return result;
   }
 
   size_t readBytes(uint8_t *data, size_t len) {
     TRACED();
     size_t result = 0;
-    custom_log_level.set();
     reloadSegments();
 
     if (active) result = url_loader.readBytes(data, len);
-    custom_log_level.reset();
     return result;
   }
 
@@ -300,9 +294,6 @@ class HLSParser {
   /// Defines the number of urls that are preloaded in the URLLoaderHLS
   void setUrlCount(int count) { url_count = count; }
 
-  /// Defines the class specific custom log level
-  void setLogLevel(AudioLogger::LogLevel level) { custom_log_level.set(level); }
-
   /// Redefines the buffer size
   void setBufferSize(int size, int count) {
     url_loader.setBufferSize(size, count);
@@ -323,7 +314,6 @@ class HLSParser {
  protected:
   enum class URLType { Undefined, Index, Segment };
   URLType next_url_type = URLType::Undefined;
-  CustomLogLevel custom_log_level;
   int bandwidth = 0;
   int url_count = 5;
   bool url_active = false;
@@ -701,9 +691,6 @@ class HLSStream : public AbstractURLStream {
     return parser.readBytes(data, len);
   }
 
-  /// Defines the class specific custom log level
-  void setLogLevel(AudioLogger::LogLevel level) { parser.setLogLevel(level); }
-
   /// Redefines the read buffer size
   void setBufferSize(int size, int count) { parser.setBufferSize(size, count); }
 
diff --git a/src/AudioTools/CoreAudio/AudioBasic/Collections/Allocator.h b/src/AudioTools/CoreAudio/AudioBasic/Collections/Allocator.h
@@ -3,6 +3,7 @@
 
 #include "AudioToolsConfig.h"
 #include "AudioTools/CoreAudio/AudioLogger.h"
+#include "AudioTools/CoreAudio/AudioRuntime.h"
 
 namespace audio_tools {
 
diff --git a/src/AudioTools/CoreAudio/AudioHttp/URLStream.h b/src/AudioTools/CoreAudio/AudioHttp/URLStream.h
@@ -103,9 +103,6 @@ class URLStream : public AbstractURLStream {
     total_read = 0;
     active = result == 200;
     LOGI("==> http status: %d", result);
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.reset();
-#endif
     return active;
   }
 
@@ -129,9 +126,6 @@ class URLStream : public AbstractURLStream {
     total_read = 0;
     active = result == 200;
     LOGI("==> http status: %d", result);
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.reset();
-#endif
     return active;
   }
 
@@ -260,10 +254,6 @@ class URLStream : public AbstractURLStream {
     return request.available() > 0;
   }
 
-#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
   const char* urlStr() { return url_str.c_str(); }
 
 /// Define the Root PEM Certificate for SSL
@@ -275,9 +265,6 @@ class URLStream : public AbstractURLStream {
 
  protected:
   HttpRequest request;
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-  CustomLogLevel custom_log_level;
-#endif
   Str url_str;
   Url url;
   long size;
@@ -305,9 +292,6 @@ class URLStream : public AbstractURLStream {
 
   bool preProcess(const char* urlStr, const char* acceptMime) {
     TRACED();
-#if USE_AUDIO_LOGGING && !defined(USE_IDF_LOGGER)
-    custom_log_level.set();
-#endif
     url_str = urlStr;
     url.setUrl(url_str.c_str());
     int result = -1;
diff --git a/src/AudioTools/Disk/VFS.h b/src/AudioTools/Disk/VFS.h
@@ -14,11 +14,11 @@ namespace audio_tools {
 class VFS {
  public:
   /// mount the file systems
-  virtual bool begin() = 0;
+  virtual bool begin() {return true;}
   /// unmount the file system
-  virtual void end() = 0;
+  virtual void end() {} 
   /// provide the mount point (root directory for the file system)
-  virtual void setMountPoint(const char* mp) = 0;
+  virtual void setMountPoint(const char* mp) { mount_point = mp; };
 
   VFSFile open(const char* file, FileMode mode = VFS_FILE_READ) {
     VFSFile vfs_file;
diff --git a/src/AudioToolsConfig.h b/src/AudioToolsConfig.h
@@ -15,7 +15,6 @@
 #  include "AudioTools/AudioLibs/Desktop/NoArduino.h"
 #  include "AudioTools/AudioLibs/Desktop/Time.h"
 #  include "AudioTools/AudioLibs/Desktop/Main.h"
-#  include "AudioTools/AudioLibs/Desktop/File.h"
 #  define USE_STREAM_READ_OVERRIDE
 #  ifndef EXIT_ON_STOP
 #    define EXIT_ON_STOP
diff --git a/tests-cmake/fft-effect/fft-effect.cpp b/tests-cmake/fft-effect/fft-effect.cpp
@@ -1,6 +1,7 @@
 #include "AudioTools.h"
 #include "AudioTools/AudioLibs/MiniAudioStream.h"
 #include "AudioTools/AudioLibs/FFTEffects.h"
+#include "AudioTools/AudioLibs/Desktop/File.h"
 
 AudioInfo info(16000, 2, 16);
 MiniAudioStream out; // final output of decoded stream
