Skip to content

Commit 0f282f0

Browse files
pschatzmannpschatzmann
committedOct 5, 2024·
Support for AudioTools 1.0.0
1 parent cd3b2b6 commit 0f282f0

File tree

12 files changed

+26
-18
lines changed

12 files changed

+26
-18
lines changed
 

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Here is an example Arduino sketch that uses the Wifi as communication API, the W
2727
```C++
2828
#include "AudioTools.h"
2929
#include "SnapClient.h"
30-
#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
30+
#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
3131
//#include "api/SnapProcessorRTOS.h" // install https://github.com/pschatzmann/arduino-freertos-addons
3232

3333
OpusAudioDecoder codec;

‎desktop-client/SnapClient.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,11 @@
55
*/
66
#include "AudioTools.h"
77
#include "SnapClient.h"
8-
#include "AudioLibs/MiniAudioStream.h"
9-
//#include "AudioCodecs/CodecOpus.h"
10-
//#include "AudioCodecs/CodecFLAC.h" // https://github.com/pschatzmann/arduino-libflac.git
11-
#include "AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
12-
#include "AudioLibs/StdioStream.h"
8+
#include "AudioTools/AudioLibs/MiniAudioStream.h"
9+
//#include "AudioTools/AudioCodecs/CodecOpus.h"
10+
//#include "AudioTools/AudioCodecs/CodecFLAC.h" // https://github.com/pschatzmann/arduino-libflac.git
11+
#include "AudioTools/AudioCodecs/CodecVorbis.h" //https://github.com/pschatzmann/arduino-libvorbis-idec
12+
#include "AudioTools/AudioLibs/StdioStream.h"
1313

1414
//CsvOutput<int16_t> out;
1515
//StdioStream out;

‎examples/SnapClientAudioKit/SnapClientAudioKit.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
*/
66
#include "AudioTools.h"
77
#include "SnapClient.h"
8-
#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
9-
#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
8+
#include "AudioTools/AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
9+
#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
1010

1111
#define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
1212

‎examples/SnapClientFreeRTOS/SnapClientFreeRTOS.ino

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
#include "AudioTools.h"
22
#include "SnapClient.h"
33
#include "api/SnapProcessorRTOS.h" // install https://github.com/pschatzmann/arduino-freertos-addons
4-
#include "AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
5-
#include "AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
4+
#include "AudioTools/AudioLibs/AudioBoardStream.h" // install https://github.com/pschatzmann/arduino-audio-driver
5+
#include "AudioTools/AudioCodecs/CodecOpus.h" // https://github.com/pschatzmann/arduino-libopus
66

77

88
AudioBoardStream out(AudioKitEs8388V1); // or replace with e.g. I2SStream out;

‎examples/SnapClientI2S/SnapClientI2S.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "AudioTools.h"
88
#include "SnapClient.h"
9-
#include "AudioCodecs/CodecOpus.h"
9+
#include "AudioTools/AudioCodecs/CodecOpus.h"
1010

1111
#define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
1212

‎examples/SnapClientInternalDAC/SnapClientInternalDAC.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
#include "AudioTools.h"
88
#include "SnapClient.h"
9-
#include "AudioCodecs/CodecOpus.h"
9+
#include "AudioTools/AudioCodecs/CodecOpus.h"
1010

1111
#define ARDUINO_LOOP_STACK_SIZE (10 * 1024)
1212

‎examples/SnapClientVS1053/SnapClientVS1053.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
*/
99
#include "AudioTools.h"
1010
#include "SnapClient.h"
11-
#include "AudioLibs/VS1053Stream.h"
11+
#include "AudioTools/AudioLibs/VS1053Stream.h"
1212

1313

1414
VS1053Stream out; // final output

‎examples/Tests/TestGetHttp/TestGetHttp.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11

22
#include "AudioTools.h"
33
#include "SnapClient.h"
4-
#include "AudioCodecs/CodecOpus.h"
4+
#include "AudioTools/AudioCodecs/CodecOpus.h"
55

66
OpusAudioDecoder opus;
77
NullStream out;

‎examples/Tests/TestOutput/TestOutput.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "AudioTools.h"
22
#include "SnapClient.h"
3-
#include "AudioCodecs/CodecOpus.h"
3+
#include "AudioTools/AudioCodecs/CodecOpus.h"
44

55
OpusAudioDecoder opus;
66
NullStream out;

‎examples/Tests/TestTime/TestTime.ino

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#include "AudioTools.h"
22
#include "SnapClient.h"
3-
#include "AudioCodecs/CodecOpus.h"
3+
#include "AudioTools/AudioCodecs/CodecOpus.h"
44

55
OpusAudioDecoder opus;
66
NullStream out;

‎src/api/SnapProcessorRTOS.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#pragma once
22
#include "SnapOutput.h"
3-
#include "AudioLibs/Concurrency.h"
3+
#if defined(AUDIOTOOLS_MAJOR_VERSION)
4+
# include "AudioTools/AudioLibs/Concurrency.h"
5+
#else
6+
# include "AudioLibs/Concurrency.h"
7+
#endif
48

59
namespace snap_arduino {
610

‎src/api/SnapTime.h

+5-1
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
#pragma once
2-
#include "AudioBasic/Collections/Vector.h"
32
#include "AudioConfig.h"
3+
#if defined(AUDIOTOOLS_MAJOR_VERSION)
4+
# include "AudioTools/CoreAudio/AudioBasic/Collections/Vector.h"
5+
#else
6+
# include "AudioBasic/Collections/Vector.h"
7+
#endif
48
#include <stdint.h>
59
#include <sys/time.h>
610

0 commit comments

Comments
 (0)