Skip to content

Commit 844e3b7

Browse files
committed
Correct compile errors for examples
1 parent c5d5129 commit 844e3b7

File tree

19 files changed

+69
-63
lines changed

19 files changed

+69
-63
lines changed

examples/build-arch-log.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ esp32:esp32:esp32c3 ./examples-stream/streams-generator-serial -> rc=0
33
esp32:esp32:esp32s3 ./examples-stream/streams-generator-serial -> rc=0
44
esp32:esp32:esp32s2 ./examples-stream/streams-generator-serial -> rc=0
55
esp8266:esp8266:generic ./examples-stream/streams-generator-serial -> rc=0
6-
arduino:mbed_rp2040:pico ./examples-stream/streams-generator-serial -> rc=0
76
rp2040:rp2040:generic ./examples-stream/streams-generator-serial -> rc=0
87
arduino:avr:nano ./examples-stream/streams-generator-serial -> rc=0
98
arduino:samd:arduino_zero_native ./examples-stream/streams-generator-serial -> rc=0
9+
arduino:renesas_uno:unor4wifi ./examples-stream/streams-generator-serial -> rc=0

examples/build-arch.sh

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,11 @@ compile_example "esp32:esp32:esp32c3"
2323
compile_example "esp32:esp32:esp32s3"
2424
compile_example "esp32:esp32:esp32s2"
2525
compile_example "esp8266:esp8266:generic"
26-
compile_example "arduino:mbed_rp2040:pico"
26+
#compile_example "arduino:mbed_rp2040:pico"
2727
compile_example "rp2040:rp2040:generic"
2828
compile_example "arduino:avr:nano"
2929
compile_example "arduino:samd:arduino_zero_native"
30+
compile_example "arduino:renesas_uno:unor4wifi"
3031
#compile_example "STMicroelectronics:stm32:GenF4"
3132

3233
./cleanup.sh

examples/build-examples-log.txt

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,11 @@
1818
../examples/examples-player/player-url_subclass-i2s -> rc=0
1919
../examples/examples-webserver/streams-effect-webserver_wav -> rc=0
2020
../examples/examples-webserver/streams-flite-webserver_wav -> rc=0
21+
../examples/examples-webserver/streams-generator-webserver_aac -> rc=0
2122
../examples/examples-webserver/streams-generator-webserverex_wav -> rc=0
2223
../examples/examples-webserver/streams-generator-webserverex_wav1 -> rc=0
24+
../examples/examples-webserver/streams-generator-webserver_mp3 -> rc=1/0
25+
../examples/examples-webserver/streams-generator-webserver_ogg -> rc=0
2326
../examples/examples-webserver/streams-generator-webserver_wav -> rc=0
2427
../examples/examples-webserver/streams-i2s-webserver_wav -> rc=0
2528
../examples/examples-webserver/streams-sam-webserver_wav -> rc=0
@@ -36,11 +39,13 @@
3639
../examples/examples-stream/streams-generator-pwm -> rc=0
3740
../examples/examples-stream/streams-generator-serial -> rc=0
3841
../examples/examples-stream/streams-generator-spdif -> rc=0
42+
../examples/examples-stream/streams-generator-volume -> rc=0
3943
../examples/examples-stream/streams-generator-wm8960 -> rc=0
4044
../examples/examples-stream/streams-i2s-a2dp -> rc=0
4145
../examples/examples-stream/streams-i2s-filter-i2s -> rc=0
4246
../examples/examples-stream/streams-i2s-i2s -> rc=0
4347
../examples/examples-stream/streams-i2s-i2s-2 -> rc=0
48+
../examples/examples-stream/streams-i2s_pdm-serial -> rc=0
4449
../examples/examples-stream/streams-i2s-serial -> rc=0
4550
../examples/examples-stream/streams-i2s-serial_16bit -> rc=0
4651
../examples/examples-stream/streams-i2s-tf -> rc=0
@@ -50,7 +55,7 @@
5055
../examples/examples-stream/streams-memory_mp3_short-i2s -> rc=0
5156
../examples/examples-stream/streams-memory_mp3_short-i2s-2 -> rc=0
5257
../examples/examples-stream/streams-memory_raw-i2s -> rc=0
53-
../examples/examples-stream/streams-memory_wav-pwm -> rc=1/0
58+
../examples/examples-stream/streams-memory_wav-pwm -> rc=0
5459
../examples/examples-stream/streams-memory_wav-serial -> rc=0
5560
../examples/examples-stream/streams-mp34dt05-serial -> rc=1
5661
../examples/examples-stream/streams-sdfat_mp3-metadata -> rc=0
@@ -77,6 +82,7 @@
7782
../examples/examples-audiokit/player-sdfat-audiokit -> rc=0
7883
../examples/examples-audiokit/player-sdmmc-audiokit -> rc=0
7984
../examples/examples-audiokit/player-url_icy-audiokit -> rc=0
85+
../examples/examples-audiokit/README.md -> rc=1
8086
../examples/examples-audiokit/streams-a2dp-audiokit -> rc=0
8187
../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
8288
../examples/examples-audiokit/streams-audiokit-effects-audiokit -> rc=0
@@ -91,11 +97,12 @@
9197
../examples/examples-audiokit/streams-audiokit-sd_wav -> rc=0
9298
../examples/examples-audiokit/streams-audiokit-serial -> rc=0
9399
../examples/examples-audiokit/streams-audiokit-tf -> rc=0
100+
../examples/examples-audiokit/streams-audiokit-webserver_aac -> rc=0
94101
../examples/examples-audiokit/streams-audiokit-webserver_wav -> rc=0
95102
../examples/examples-audiokit/streams-file_loop-audiokit -> rc=0
96103
../examples/examples-audiokit/streams-generator-audiokit -> rc=0
97104
../examples/examples-audiokit/streams-generator_fromarray-audiokit -> rc=0
98-
../examples/examples-audiokit/streams-generator_inputmixer-audiokit -> rc=0
105+
../examples/examples-audiokit/streams-generator_inputmixer-audiokit -> rc=1
99106
../examples/examples-audiokit/streams-generator_outputmixer-audiokit -> rc=0
100107
../examples/examples-audiokit/streams-generator_sinfromtable-audiokit -> rc=0
101108
../examples/examples-audiokit/streams-memory_mp3-audiokit -> rc=0
@@ -133,6 +140,7 @@
133140
../examples/examples-maximilian/18-DrumMachine -> rc=0
134141
../examples/examples-maximilian/19-Enveloping2 -> rc=0
135142
../examples/examples-maximilian/20-FFT -> rc=0
143+
../examples/examples-maximilian/README.md -> rc=1
136144
../examples/examples-tts/streams-azure_tts-i2s -> rc=1
137145
../examples/examples-tts/streams-espeak-audiokit -> rc=0
138146
../examples/examples-tts/streams-espeak-i2s -> rc=0
@@ -148,7 +156,7 @@
148156
../examples/examples-faust/streams-i2s-faust_guitarix-i2s -> rc=0
149157
../examples/examples-communication/esp-now/codec/communication-codec-espnow-receive -> rc=0
150158
../examples/examples-communication/esp-now/codec/communication-codec-espnow-receive_measure -> rc=0
151-
../examples/examples-communication/esp-now/codec/communication-codec-espnow-send -> rc=1/0
159+
../examples/examples-communication/esp-now/codec/communication-codec-espnow-send -> rc=0
152160
../examples/examples-communication/esp-now/pcm/communication-espnow-receive -> rc=0
153161
../examples/examples-communication/esp-now/pcm/communication-espnow-receive_csv -> rc=0
154162
../examples/examples-communication/esp-now/pcm/communication-espnow-receive_measure -> rc=0
@@ -172,6 +180,8 @@
172180
../examples/tests/test-resample-in -> rc=0
173181
../examples/tests/test-resample-out -> rc=0
174182
../examples/tests/24bits/24bits-write -> rc=0
183+
../examples/tests/codecs/test-codec-adpcm -> rc=0
184+
../examples/tests/codecs/test-codec-adpcm-xq -> rc=0
175185
../examples/tests/codecs/test-codec-aptx -> rc=0
176186
../examples/tests/codecs/test-codec-base64 -> rc=0
177187
../examples/tests/codecs/test-codec-codec2 -> rc=0
@@ -186,12 +196,12 @@
186196
../examples/tests/codecs/test-codec-iLBC -> rc=0
187197
../examples/tests/codecs/test-codec-l8 -> rc=0
188198
../examples/tests/codecs/test-codec-lc3 -> rc=0
189-
../examples/tests/codecs/test-codec-ogg -> rc=0
190199
../examples/tests/codecs/test-codec-opus -> rc=0
191200
../examples/tests/codecs/test-codec-opusogg -> rc=0
192201
../examples/tests/codecs/test-codec-sbc -> rc=0
193-
../examples/tests/codecs/test-container-avi -> rc=1/0
194202
../examples/tests/codecs/test-container-binary -> rc=0
203+
../examples/tests/codecs/test-container-binary-meta -> rc=0
204+
../examples/tests/codecs/test-container-ogg -> rc=0
195205
../examples/tests/codecs/test-mp3-helix -> rc=0
196206
../examples/tests/codecs/test-mp3-helix-reading -> rc=0
197207
../examples/tests/codecs/test-mp3-mad -> rc=0

examples/examples-audiokit/streams-audiokit-filter-audiokit/streams-audiokit-filter-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ AudioInfo info(44100, 2, 16);
1212
AudioKitStream kit;
1313

1414
// copy filtered values
15-
FilteredStream<int16_t, float> filtered(kit, channels); // Defiles the filter as BaseConverter
15+
FilteredStream<int16_t, float> filtered(kit, info.channels); // Defiles the filter as BaseConverter
1616
StreamCopy copier(filtered, kit); // copies sound into i2s (both from kit to filtered or filered to kit are supported)
1717

1818
// define FIR filter

examples/examples-audiokit/streams-audiokit-ram-audiokit/streams-audiokit-ram-audiokit.ino

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ void record_end(bool pinStatus, int pin, void* ref){
3232
// Remove popping noise, from button: we delete 6 segments at the beginning and end
3333
// and on the resulting audio we slowly raise the volume on the first segment
3434
// end decrease it on the last segment
35-
recording.postProcessSmoothTransition<int16_t>(channels, 0.01, 6);
35+
recording.postProcessSmoothTransition<int16_t>(info.channels, 0.01, 6);
3636

3737
copier.begin(kit, recording); // start playback
3838
}

examples/examples-audiokit/streams-audiokit-ram-ptichshift-audiokit/streams-audiokit-ram-ptichshift-audiokit.ino

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ void record_end(bool pinStatus, int pin, void* ref){
3535
// Remove popping noise, from button: we delete 6 segments at the beginning and end
3636
// and on the resulting audio we slowly raise the volume on the first segment
3737
// end decrease it on the last segment
38-
recording.postProcessSmoothTransition<int16_t>(channels, 0.01, 6);
38+
recording.postProcessSmoothTransition<int16_t>(info.channels, 0.01, 6);
3939

4040
// output with pitch shifting
4141
copier.begin(pitch_shift, recording); // start playback
@@ -64,15 +64,12 @@ void setup(){
6464
// record when key 1 is pressed
6565
kit.audioActions().add(PIN_KEY1, record_start, record_end);
6666
Serial.println("Press Key 1 to record");
67-
6867
}
6968

7069
void loop(){
71-
7270
// record or play recording
7371
copier.copy();
7472

7573
// Process keys
7674
kit.processActions();
77-
7875
}

examples/examples-audiokit/streams-generator_inputmixer-audiokit/streams-generator_inputmixer-audiokit.ino

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ GeneratedSoundStream<int16_t> sound2(sineWave2); // Stream generated
1616
InputMixer<int16_t> mixer;
1717
AudioKitStream out;
1818
StreamCopy copier(out, mixer); // copies sound into i2s
19-
AudioInfo info;
2019

2120
// Arduino Setup
2221
void setup(void) {

examples/examples-stream/streams-generator-serial/streams-generator-serial.ino

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
#include "AudioTools.h"
99

1010

11-
AudioInfo info(44100, 2, 16);
11+
AudioInfo audio_info(44100, 2, 16);
1212
SineWaveGenerator<int16_t> sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000
1313
GeneratedSoundStream<int16_t> sound(sineWave); // Stream generated from sine wave
1414
CsvOutput<int16_t> out(Serial);
@@ -21,10 +21,10 @@ void setup(void) {
2121
AudioLogger::instance().begin(Serial, AudioLogger::Warning);
2222

2323
// Define CSV Output
24-
out.begin(info);
24+
out.begin(audio_info);
2525

2626
// Setup sine wave
27-
sineWave.begin(info, N_B4);
27+
sineWave.begin(audio_info, N_B4);
2828
Serial.println("started...");
2929
}
3030

examples/examples-stream/streams-i2s-filter-i2s/streams-i2s-filter-i2s.ino

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,8 +12,8 @@ I2SStream in;
1212
I2SStream out;
1313

1414
// copy filtered values
15-
FilteredStream<int16_t, float> filtered(in, channels); // Defiles the filter as BaseConverter
16-
StreamCopy copier(out, filtered); // copies sound into i2s
15+
FilteredStream<int16_t, float> filtered(in, info.channels); // Defiles the filter as BaseConverter
16+
StreamCopy copier(out, filtered); // copies sound into i2s
1717

1818
// define FIR filter parameters
1919
float coef[] = { 0.021, 0.096, 0.146, 0.096, 0.021};

examples/examples-stream/streams-memory_wav-pwm/streams-memory_wav-pwm.ino

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -12,27 +12,24 @@
1212
//#include "knghtsng.h"
1313
#include "alice.h"
1414

15-
16-
1715
//Data Flow: MemoryStream -> EncodedAudioStream -> PWMAudioOutput
18-
16+
//Use 8000 for alice_wav and 11025 for knghtsng_wav
17+
AudioInfo info(8000, 1, 16);
1918
//MemoryStream wav(knghtsng_wav, knghtsng_wav_len);
2019
MemoryStream wav(alice_wav, alice_wav_len);
2120
PWMAudioOutput pwm; // PWM output
22-
WAVDecoder decoder(pwm); // decode wav to pcm and send it to printer
23-
EncodedAudioStream out(&pwm, &decoder); // Decoder stream
21+
EncodedAudioStream out(&pwm, new WAVDecoder()); // Decoder stream
2422
StreamCopy copier(out, wav); // copy in to out
2523

2624
void setup(){
2725
Serial.begin(115200);
2826
AudioLogger::instance().begin(Serial, AudioLogger::Info);
2927

30-
auto config = pwm.defaultConfig();
28+
wav.begin();
29+
out.begin();
3130

32-
// setup pwm output
33-
config.channels = 1;
34-
//config.sample_rate = 11025; // for knghtsng_wav
35-
config.sample_rate = 8000; // for alice_wav
31+
auto config = pwm.defaultConfig();
32+
config.copyFrom(info);
3633
pwm.begin(config);
3734
}
3835

@@ -41,14 +38,14 @@ void loop(){
4138
copier.copy();
4239
} else {
4340
// after we are done we just print some info form the wav file
44-
auto info = decoder.audioInfo();
41+
auto info = out.audioInfo();
4542
LOGI("The audio rate from the wav file is %d", info.sample_rate);
4643
LOGI("The channels from the wav file is %d", info.channels);
4744

4845
// restart from the beginning
4946
Serial.println("Restarting...");
5047
delay(5000);
51-
decoder.begin(); // indicate that we process the WAV header
48+
out.begin(); // indicate that we process the WAV header
5249
wav.begin(); // reset actual position to 0
5350
pwm.begin(); // reset counters
5451
}

0 commit comments

Comments
 (0)