Skip to content

Commit c5e3848

Browse files
authored
Disk (#1956)
* Move file operations to disk directory * Restore broken examples * Move audiokit player examples * build-examples * Cleanup File.h * File.h compile error * compile errors for desktop builds * move AudioSourceURL to separate file * VFS test case * VFS_Multi * Document default mount points
1 parent b6db798 commit c5e3848

File tree

88 files changed

+5538
-2101
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

88 files changed

+5538
-2101
lines changed

CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ else()
2626
add_library(arduino-audio-tools INTERFACE)
2727

2828
option(BUILD_SHARED_LIBS "Build using shared libraries" OFF)
29-
option(ADD_PORTAUDIO "Add Portaudio Library" ON)
29+
option(ADD_PORTAUDIO "Add Portaudio Library" OFF)
3030
option(ADD_ARDUINO_EMULATOR "Add Arduino Emulator Library" ON)
3131

3232

examples/build-examples-log.txt

Lines changed: 33 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,13 @@
55
../examples/examples-basic-api/base-SynchronizedBufferRTOS -> rc=0
66
../examples/examples-player/player-callback-i2s -> rc=0
77
../examples/examples-player/player-littlefs-i2s -> rc=0
8+
../examples/examples-player/player-sd-audiokit -> rc=0
89
../examples/examples-player/player-sdfat-analog -> rc=0
10+
../examples/examples-player/player-sdfat-audiokit -> rc=0
911
../examples/examples-player/player-sdfat-ffti2s -> rc=0
1012
../examples/examples-player/player-sdfat-i2s -> rc=0
1113
../examples/examples-player/player-sd-i2s -> rc=0
14+
../examples/examples-player/player-sdmmc-audiokit -> rc=0
1215
../examples/examples-player/player-spiffs-i2s -> rc=0
1316
../examples/examples-stream/streams-adc-i2s -> rc=0
1417
../examples/examples-stream/streams-adc-serial -> rc=0
@@ -29,7 +32,7 @@
2932
../examples/examples-stream/streams-i2s-filter-i2s -> rc=0
3033
../examples/examples-stream/streams-i2s-i2s -> rc=0
3134
../examples/examples-stream/streams-i2s-i2s-2 -> rc=0
32-
../examples/examples-stream/streams-i2s_pdm-serial -> rc=1
35+
../examples/examples-stream/streams-i2s_pdm-serial -> rc=0
3336
../examples/examples-stream/streams-i2s-serial -> rc=0
3437
../examples/examples-stream/streams-i2s-serial_16bit -> rc=0
3538
../examples/examples-stream/streams-i2s-tf -> rc=0
@@ -46,9 +49,6 @@
4649
../examples/examples-stream/streams-sd_mp3-i2s -> rc=0
4750
../examples/examples-stream/streams-sd_wav4-i2s -> rc=0
4851
../examples/examples-stream/streams-tf-i2s -> rc=0
49-
../examples/examples-audiokit/player-sd-audiokit -> rc=0
50-
../examples/examples-audiokit/player-sdfat-audiokit -> rc=0
51-
../examples/examples-audiokit/player-sdmmc-audiokit -> rc=0
5252
../examples/examples-audiokit/README.md -> rc=1
5353
../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
5454
../examples/examples-audiokit/streams-audiokit-effects-audiokit -> rc=0
@@ -71,8 +71,8 @@
7171
../examples/examples-audiokit/streams-generator_sinfromtable-audiokit -> rc=0
7272
../examples/examples-audiokit/streams-memory_mp3-audiokit -> rc=0
7373
../examples/examples-audiokit/streams-memory_pcm-mixer-audiokit -> rc=0
74-
../examples/examples-audiokit/streams-pins-audiokit -> rc=1
75-
../examples/examples-audiokit/streams-sd_flac-audiokit -> rc=0
74+
../examples/examples-audiokit/streams-pins-audiokit -> rc=0
75+
../examples/examples-audiokit/streams-sd_flac-audiokit -> rc=1
7676
../examples/examples-audiokit/streams-sdmmc_wav-audiokit -> rc=0
7777
../examples/examples-audiokit/streams-sd_mp3-audiokit -> rc=0
7878
../examples/examples-audiokit/streams-synth-audiokit -> rc=0
@@ -82,15 +82,17 @@
8282
../examples/examples-audiokit/streams-synthstk-audiokit -> rc=0
8383
../examples/examples-audiokit/streams-tf-audiokit -> rc=0
8484
../examples/examples-tts/streams-azure_tts-i2s -> rc=0
85-
../examples/examples-tts/streams-espeak-audiokit -> rc=1
86-
../examples/examples-tts/streams-espeak-i2s -> rc=1
87-
../examples/examples-tts/streams-flite-audiokit -> rc=1
88-
../examples/examples-tts/streams-flite-i2s -> rc=1
85+
../examples/examples-tts/streams-espeak-audiokit -> rc=0
86+
../examples/examples-tts/streams-espeak-i2s -> rc=0
87+
../examples/examples-tts/streams-flite-audiokit -> rc=0
88+
../examples/examples-tts/streams-flite-i2s -> rc=0
8989
../examples/examples-tts/streams-google-audiokit -> rc=0
9090
../examples/examples-tts/streams-sam-audiokit -> rc=0
9191
../examples/examples-tts/streams-sam-i2s -> rc=0
92-
../examples/examples-tts/streams-simple_tts-a2dp -> rc=1
93-
../examples/examples-tts/streams-simple_tts-i2s -> rc=1
92+
../examples/examples-tts/streams-simple_tts-a2dp -> rc=0
93+
../examples/examples-tts/streams-simple_tts-i2s -> rc=0
94+
../examples/examples-tts/streams-talkie-a2dp -> rc=0
95+
../examples/examples-tts/streams-talkie-audiokit -> rc=0
9496
../examples/examples-tts/streams-tts-i2s -> rc=0
9597
../examples/examples-tts/streams-url_wav-i2s -> rc=0
9698
../examples/examples-dsp/examples-maximilian/01-TestTone -> rc=0
@@ -120,8 +122,8 @@
120122
../examples/examples-dsp/examples-mozzi/control_gain -> rc=0
121123
../examples/examples-dsp/examples-mozzi/control_gain-a2dp -> rc=0
122124
../examples/examples-dsp/examples-pd/README.md -> rc=1
123-
../examples/examples-dsp/examples-pd/streams-generator-pd-audiokit -> rc=0
124-
../examples/examples-dsp/examples-pd/streams-pd-audiokit -> rc=0
125+
../examples/examples-dsp/examples-pd/streams-generator-pd-audiokit -> rc=1
126+
../examples/examples-dsp/examples-pd/streams-pd-audiokit -> rc=1
125127
../examples/examples-dsp/examples-stk/README.md -> rc=1
126128
../examples/examples-dsp/examples-stk/streams-stk_allinstruments-audiokit -> rc=0
127129
../examples/examples-dsp/examples-stk/streams-stk-audiokit -> rc=0
@@ -192,11 +194,12 @@
192194
../examples/examples-communication/http-client/player-url_icy-audiokit -> rc=0
193195
../examples/examples-communication/http-client/player-url_icy-i2s -> rc=0
194196
../examples/examples-communication/http-client/player-url_subclass-i2s -> rc=0
195-
../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=1
197+
../examples/examples-communication/http-client/streams-eth_url_mp3_helix-i2s -> rc=0
196198
../examples/examples-communication/http-client/streams-http_post -> rc=0
197199
../examples/examples-communication/http-client/streams-url_aac-audiokit -> rc=0
198200
../examples/examples-communication/http-client/streams-url_aac-i2s -> rc=0
199201
../examples/examples-communication/http-client/streams-url-file -> rc=0
202+
../examples/examples-communication/http-client/streams-url_flac_foxen-i2s -> rc=0
200203
../examples/examples-communication/http-client/streams-url_flac-i2s -> rc=0
201204
../examples/examples-communication/http-client/streams-url-measuring -> rc=0
202205
../examples/examples-communication/http-client/streams-url_mp3-analog -> rc=0
@@ -206,22 +209,24 @@
206209
../examples/examples-communication/http-client/streams-url_mp3_mad-i2s -> rc=0
207210
../examples/examples-communication/http-client/streams-url_mp3-metadata -> rc=0
208211
../examples/examples-communication/http-client/streams-url_mp3-metadata2 -> rc=0
212+
../examples/examples-communication/http-client/streams-url_mp3-pwm -> rc=0
209213
../examples/examples-communication/http-client/streams-url_mts-hex -> rc=0
210214
../examples/examples-communication/http-client/streams-url_post -> rc=0
211215
../examples/examples-communication/http-client/streams-url_raw-i2s -> rc=0
212216
../examples/examples-communication/http-client/streams-url_raw-serial -> rc=0
213217
../examples/examples-communication/http-client/streams-url_vorbis_i2s -> rc=0
214-
../examples/examples-communication/http-server/player-sd-webserverex_mp3 -> rc=1
218+
../examples/examples-communication/http-server/player-sd-webserverex_mp3 -> rc=0
219+
../examples/examples-communication/http-server/python-post-server -> rc=1
215220
../examples/examples-communication/http-server/README.md -> rc=1
216221
../examples/examples-communication/http-server/streams-audiokit-webserver_aac -> rc=0
217-
../examples/examples-communication/http-server/streams-audiokit-webserver_mp3 -> rc=1
222+
../examples/examples-communication/http-server/streams-audiokit-webserver_mp3 -> rc=0
218223
../examples/examples-communication/http-server/streams-audiokit-webserver_wav -> rc=0
219224
../examples/examples-communication/http-server/streams-effect-webserver_wav -> rc=0
220-
../examples/examples-communication/http-server/streams-flite-webserver_wav -> rc=1
225+
../examples/examples-communication/http-server/streams-flite-webserver_wav -> rc=0
221226
../examples/examples-communication/http-server/streams-generator-webserver_aac -> rc=0
222-
../examples/examples-communication/http-server/streams-generator-webserverex_wav -> rc=1
223-
../examples/examples-communication/http-server/streams-generator-webserverex_wav1 -> rc=1
224-
../examples/examples-communication/http-server/streams-generator-webserver_mp3 -> rc=1
227+
../examples/examples-communication/http-server/streams-generator-webserverex_wav -> rc=0
228+
../examples/examples-communication/http-server/streams-generator-webserverex_wav1 -> rc=0
229+
../examples/examples-communication/http-server/streams-generator-webserver_mp3 -> rc=0
225230
../examples/examples-communication/http-server/streams-generator-webserver_ogg -> rc=0
226231
../examples/examples-communication/http-server/streams-generator-webserver_wav -> rc=0
227232
../examples/examples-communication/http-server/streams-i2s-webserver_wav -> rc=0
@@ -266,13 +271,13 @@
266271
../examples/tests/codecs/test-mp3-helix -> rc=0
267272
../examples/tests/codecs/test-mp3-helix-reading -> rc=0
268273
../examples/tests/codecs/test-mp3-mad -> rc=0
274+
../examples/tests/codecs/test-mp3_parser -> rc=0
269275
../examples/tests/codecs/test-streaming-adapter -> rc=0
270276
../examples/tests/concurrency/audio-test -> rc=0
271277
../examples/tests/concurrency/BufferRTOS -> rc=0
272278
../examples/tests/concurrency/NBuffer -> rc=0
273279
../examples/tests/concurrency/synchNBuffer -> rc=0
274280
../examples/tests/concurrency/synchRingBuffer -> rc=0
275-
../examples/tests/concurrency/SynchronizedNBuffer -> rc=0
276281
../examples/tests/conversion/channel-converter-avg -> rc=0
277282
../examples/tests/conversion/channel-converter-bin -> rc=0
278283
../examples/tests/conversion/channel-converter-bindiff -> rc=0
@@ -283,6 +288,8 @@
283288
../examples/tests/conversion/channel-converter-reduce-in -> rc=0
284289
../examples/tests/conversion/channel-converter-reduce-out -> rc=0
285290
../examples/tests/conversion/format-converter-in -> rc=0
291+
../examples/tests/conversion/numberformat-converter -> rc=0
292+
../examples/tests/conversion/numberformat-converter-typed -> rc=0
286293
../examples/tests/conversion/pipeline-in -> rc=0
287294
../examples/tests/conversion/pipeline-out -> rc=0
288295
../examples/tests/conversion/resample-mixer-in -> rc=0
@@ -303,14 +310,16 @@
303310
../examples/tests/etc/test-tdm -> rc=0
304311
../examples/tests/etc/test-write-memory -> rc=0
305312
../examples/tests/fft/fft-cmsis -> rc=1
306-
../examples/tests/fft/fft-esp32 -> rc=1
313+
../examples/tests/fft/fft-esp32 -> rc=0
307314
../examples/tests/fft/fft-espressif -> rc=0
308-
../examples/tests/fft/fft-kiss -> rc=1
315+
../examples/tests/fft/fft-ifft -> rc=0
316+
../examples/tests/fft/fft-kiss -> rc=0
309317
../examples/tests/fft/fft-real -> rc=0
310318
../examples/tests/fft/fft-topn -> rc=0
311319
../examples/tests/fft/fft-window -> rc=0
312320
../examples/tests/filters/test-90deg -> rc=0
313321
../examples/tests/filters/test-filter -> rc=0
322+
../examples/tests/filters/test-lowpass -> rc=0
314323
../examples/tests/filters/test-median-filter -> rc=0
315324
../examples/tests/performance/mp3-Speed -> rc=0
316325
../examples/tests/performance/mp3-SynchronizedBufferRTOS -> rc=0

examples/build-examples.sh

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#arduino-cli lib linstall
1111
git -C .. pull
1212
git -C ../../ESP32-A2DP pull
13+
git -C ../../arduino-audio-driver pull
14+
git -C ../../arduino-libhelix pull
1315

1416
function compile_example {
1517
ARCH=$1

examples/examples-audiokit/streams-file_loop-audiokit/streams-file_loop-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
#include <SD.h>
1313
#include "AudioTools.h"
1414
#include "AudioTools/AudioLibs/AudioBoardStream.h"
15-
#include "AudioTools/AudioLibs/FileLoop.h"
15+
#include "AudioTools/Disk/FileLoop.h"
1616
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
1717

1818

examples/examples-communication/a2dp/basic-player-a2dp/basic-player-a2dp.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
#include "AudioTools.h"
1414
#include "AudioTools/AudioLibs/A2DPStream.h"
15-
#include "AudioTools/AudioLibs/AudioSourceSDFAT.h"
15+
#include "AudioTools/Disk/AudioSourceSDFAT.h"
1616
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
1717
#include "AudioTools/AudioLibs/AudioBoardStream.h" // for SD Pins
1818

examples/examples-communication/a2dp/player-sd_a2dp-audiokit/player-sd_a2dp-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
#include "AudioTools.h"
1515
#include "AudioTools/AudioLibs/A2DPStream.h"
1616
#include "AudioTools/AudioLibs/AudioBoardStream.h"
17-
#include "AudioTools/AudioLibs/AudioSourceSDFAT.h"
17+
#include "AudioTools/Disk/AudioSourceSDFAT.h"
1818
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
1919

2020
const char *startFilePath="/";

examples/examples-communication/a2dp/player-sdfat-a2dp/player-sdfat-a2dp.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@
1111

1212
#include "AudioTools.h"
1313
#include "AudioTools/AudioLibs/A2DPStream.h"
14-
#include "AudioTools/AudioLibs/AudioSourceSDFAT.h"
14+
#include "AudioTools/Disk/AudioSourceSDFAT.h"
1515
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
1616

1717
const char *startFilePath="/";

examples/examples-communication/http-client/player-url-i2s/player-url-i2s.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "AudioTools.h"
1111
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
12+
#include "AudioTools/Disk/AudioSourceURL.h"
1213

1314

1415
const char *urls[] = {

examples/examples-communication/http-client/player-url_icy-audiokit/player-url_icy-audiokit.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
#include "AudioTools.h"
1010
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
1111
#include "AudioTools/AudioLibs/AudioBoardStream.h"
12+
#include "AudioTools/Disk/AudioSourceURL.h"
1213

1314
const char *urls[] = {
1415
"http://stream.srg-ssr.ch/m/rsj/mp3_128",

examples/examples-communication/http-client/player-url_icy-i2s/player-url_icy-i2s.ino

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99

1010
#include "AudioTools.h"
1111
#include "AudioTools/AudioCodecs/CodecMP3Helix.h"
12+
#include "AudioTools/Disk/AudioSourceURL.h"
1213

1314

1415
const char *urls[] = {

0 commit comments

Comments
 (0)