Support for AudioTools 1.0.0

pschatzmann · Oct 5, 2024 · 0f282f0 · 0f282f0
1 parent cd3b2b6
commit 0f282f0
Show file tree

Hide file tree

Showing 12 changed files with 26 additions and 18 deletions.
diff --git a/README.md b/README.md
@@ -27,7 +27,7 @@ Here is an example Arduino sketch that uses the Wifi as communication API, the W
 ```C++
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
+#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
 //#include "api/SnapProcessorRTOS.h" // install https://github.com/pschatzmann/arduino-freertos-addons
 
 OpusAudioDecoder codec;

diff --git a/desktop-client/SnapClient.cpp b/desktop-client/SnapClient.cpp
@@ -5,11 +5,11 @@
  */
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioLibs/MiniAudioStream.h"
-//#include "AudioCodecs/CodecOpus.h"
-//#include "AudioCodecs/CodecFLAC.h"   // https://github.com/pschatzmann/arduino-libflac.git
-#include "AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
-#include "AudioLibs/StdioStream.h"
+#include "AudioTools/AudioLibs/MiniAudioStream.h"
+//#include "AudioTools/AudioCodecs/CodecOpus.h"
+//#include "AudioTools/AudioCodecs/CodecFLAC.h"   // https://github.com/pschatzmann/arduino-libflac.git
+#include "AudioTools/AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
+#include "AudioTools/AudioLibs/StdioStream.h"
 
 //CsvOutput<int16_t> out;
 //StdioStream out;

diff --git a/examples/SnapClientAudioKit/SnapClientAudioKit.ino b/examples/SnapClientAudioKit/SnapClientAudioKit.ino
@@ -5,8 +5,8 @@
  */
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
-#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
+#include "AudioTools/AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
+#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
 
 #define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
 

diff --git a/examples/SnapClientFreeRTOS/SnapClientFreeRTOS.ino b/examples/SnapClientFreeRTOS/SnapClientFreeRTOS.ino
@@ -1,8 +1,8 @@
 #include "AudioTools.h"
 #include "SnapClient.h"
 #include "api/SnapProcessorRTOS.h" // install https://github.com/pschatzmann/arduino-freertos-addons
-#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
-#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
+#include "AudioTools/AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
+#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
 
 
 AudioBoardStream out(AudioKitEs8388V1);  // or replace with e.g. I2SStream out;

diff --git a/examples/SnapClientI2S/SnapClientI2S.ino b/examples/SnapClientI2S/SnapClientI2S.ino
@@ -6,7 +6,7 @@
 
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
+#include "AudioTools/AudioCodecs/CodecOpus.h"
 
 #define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
 

diff --git a/examples/SnapClientInternalDAC/SnapClientInternalDAC.ino b/examples/SnapClientInternalDAC/SnapClientInternalDAC.ino
@@ -6,7 +6,7 @@
 
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
+#include "AudioTools/AudioCodecs/CodecOpus.h"
 
 #define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
 

diff --git a/examples/SnapClientVS1053/SnapClientVS1053.ino b/examples/SnapClientVS1053/SnapClientVS1053.ino
@@ -8,7 +8,7 @@
  */
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioLibs/VS1053Stream.h"
+#include "AudioTools/AudioLibs/VS1053Stream.h"
 
 
 VS1053Stream out; // final output

diff --git a/examples/Tests/TestGetHttp/TestGetHttp.ino b/examples/Tests/TestGetHttp/TestGetHttp.ino
@@ -1,7 +1,7 @@
 
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
+#include "AudioTools/AudioCodecs/CodecOpus.h"
 
 OpusAudioDecoder opus;
 NullStream out;

diff --git a/examples/Tests/TestOutput/TestOutput.ino b/examples/Tests/TestOutput/TestOutput.ino
@@ -1,6 +1,6 @@
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
+#include "AudioTools/AudioCodecs/CodecOpus.h"
 
 OpusAudioDecoder opus;
 NullStream out;

diff --git a/examples/Tests/TestTime/TestTime.ino b/examples/Tests/TestTime/TestTime.ino
@@ -1,6 +1,6 @@
 #include "AudioTools.h"
 #include "SnapClient.h"
-#include "AudioCodecs/CodecOpus.h"
+#include "AudioTools/AudioCodecs/CodecOpus.h"
 
 OpusAudioDecoder opus;
 NullStream out;

diff --git a/src/api/SnapProcessorRTOS.h b/src/api/SnapProcessorRTOS.h
@@ -1,6 +1,10 @@
 #pragma once
 #include "SnapOutput.h"
-#include "AudioLibs/Concurrency.h"
+#if defined(AUDIOTOOLS_MAJOR_VERSION) 
+#  include "AudioTools/AudioLibs/Concurrency.h"
+#else
+#  include "AudioLibs/Concurrency.h"
+#endif
 
 namespace snap_arduino {
 

diff --git a/src/api/SnapTime.h b/src/api/SnapTime.h
@@ -1,6 +1,10 @@
 #pragma once
-#include "AudioBasic/Collections/Vector.h"
 #include "AudioConfig.h"
+#if defined(AUDIOTOOLS_MAJOR_VERSION) 
+#  include "AudioTools/CoreAudio/AudioBasic/Collections/Vector.h"
+#else
+#  include "AudioBasic/Collections/Vector.h"
+#endif
 #include <stdint.h>
 #include <sys/time.h>