Skip to content

Commit c8e8eb7

Browse files
committed
Failing retests: corrections
1 parent 72f081d commit c8e8eb7

File tree

3 files changed

+25
-20
lines changed

3 files changed

+25
-20
lines changed

examples/build-examples-log.txt

Lines changed: 2 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@
5252
../examples/examples-stream/streams-sd_mp3-i2s -> rc=0
5353
../examples/examples-stream/streams-sd_wav4-i2s -> rc=0
5454
../examples/examples-stream/streams-tf-i2s -> rc=0
55-
../examples/examples-audiokit/README.md -> rc=1
5655
../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
5756
../examples/examples-audiokit/streams-audiokit-effects-audiokit -> rc=0
5857
../examples/examples-audiokit/streams-audiokit-fft -> rc=0
@@ -76,6 +75,7 @@
7675
../examples/examples-audiokit/streams-memory_mp3-audiokit -> rc=0
7776
../examples/examples-audiokit/streams-memory_pcm-mixer-audiokit -> rc=0
7877
../examples/examples-audiokit/streams-pins-audiokit -> rc=0
78+
../examples/examples-audiokit/streams-rtttl-audiokit -> rc=0
7979
../examples/examples-audiokit/streams-sd_flac-audiokit -> rc=0
8080
../examples/examples-audiokit/streams-sd_m4a-audiokit -> rc=0
8181
../examples/examples-audiokit/streams-sdmmc_wav-audiokit -> rc=0
@@ -122,27 +122,14 @@
122122
../examples/examples-dsp/examples-maximilian/18-DrumMachine -> rc=0
123123
../examples/examples-dsp/examples-maximilian/19-Enveloping2 -> rc=0
124124
../examples/examples-dsp/examples-maximilian/20-FFT -> rc=0
125-
../examples/examples-dsp/examples-maximilian/README.md -> rc=1
126125
../examples/examples-dsp/examples-mozzi/audio_input -> rc=0
127126
../examples/examples-dsp/examples-mozzi/control_gain -> rc=0
128127
../examples/examples-dsp/examples-mozzi/control_gain-a2dp -> rc=0
129-
../examples/examples-dsp/examples-pd/README.md -> rc=1
130128
../examples/examples-dsp/examples-pd/streams-generator-pd-audiokit -> rc=0
131129
../examples/examples-dsp/examples-pd/streams-pd-audiokit -> rc=0
132-
../examples/examples-dsp/examples-stk/README.md -> rc=1
133130
../examples/examples-dsp/examples-stk/streams-stk_allinstruments-audiokit -> rc=0
134131
../examples/examples-dsp/examples-stk/streams-stk-audiokit -> rc=0
135-
../examples/examples-dsp/examples-stk/streams-stk-desktop -> rc=1
136-
../examples/examples-dsp/examples-stk/streams-stk_files-audiokit -> rc=0
137-
../examples/examples-dsp/examples-stk/streams-stk_generator-audiokit -> rc=0
138-
../examples/examples-dsp/examples-stk/streams-stk_loop-audiokit -> rc=0
139-
../examples/examples-dsp/examples-stk/streams-stk_myinstrument-audiokit -> rc=0
140-
../examples/examples-dsp/examples-stk/streams-stk_sine-audiokit -> rc=0
141-
../examples/examples-dsp/examples-stk/streams-stk_synth-audiokit -> rc=0
142-
../examples/examples-dsp/examples-stk/README.md -> rc=1
143-
../examples/examples-dsp/examples-stk/streams-stk_allinstruments-audiokit -> rc=0
144-
../examples/examples-dsp/examples-stk/streams-stk-audiokit -> rc=0
145-
../examples/examples-dsp/examples-stk/streams-stk-desktop -> rc=1
132+
../examples/examples-dsp/examples-stk/streams-stk-desktop -> rc=0
146133
../examples/examples-dsp/examples-stk/streams-stk_files-audiokit -> rc=0
147134
../examples/examples-dsp/examples-stk/streams-stk_generator-audiokit -> rc=0
148135
../examples/examples-dsp/examples-stk/streams-stk_loop-audiokit -> rc=0
@@ -236,7 +223,6 @@
236223
../examples/examples-communication/http-client/streams-url_vorbis_i2s -> rc=0
237224
../examples/examples-communication/http-server/player-sd-webserverex_mp3 -> rc=0
238225
../examples/examples-communication/http-server/python-post-server -> rc=1
239-
../examples/examples-communication/http-server/README.md -> rc=1
240226
../examples/examples-communication/http-server/streams-audiokit-webserver_aac -> rc=0
241227
../examples/examples-communication/http-server/streams-audiokit-webserver_mp3 -> rc=0
242228
../examples/examples-communication/http-server/streams-audiokit-webserver_wav -> rc=0

examples/examples-audiokit/streams-stkk

Whitespace-only changes.

src/AudioTools/AudioLibs/AudioSTK.h

Lines changed: 23 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -68,11 +68,32 @@ class STKGenerator : public SoundGenerator<T> {
6868
}
6969
return result;
7070
}
71+
72+
protected:
73+
StkCls* p_instrument = nullptr;
74+
T max_value;
75+
};
76+
77+
/**
78+
* @brief STK Stream for Instrument
79+
* @ingroup dsp
80+
*/
81+
template <class StkCls, class T>
82+
class STKInstrument : public STKGenerator<StkCls, T> {
83+
public:
84+
STKInstrument() = default;
85+
86+
STKInstrument(StkCls& instrument) : STKGenerator<StkCls, T>(instrument) {}
87+
7188
/// sets the frequency
7289
void setFrequency(float frequency) override {
73-
p_instrument->noteOn(frequency, amplitude);
90+
this->p_instrument->noteOn(frequency, amplitude);
7491
}
7592

93+
void noteOn(float freq, float vol) { this->p_instrument->noteOn(freq, vol); }
94+
95+
void noteOff() { this->p_instrument->noteOff(); }
96+
7697
/// Defines the amplitude (0.0 ... 1.0)
7798
void setAmplitude(float amplitude) {
7899
this->amplitude = amplitude;
@@ -81,9 +102,7 @@ class STKGenerator : public SoundGenerator<T> {
81102
}
82103

83104
protected:
84-
StkCls* p_instrument = nullptr;
85-
T max_value;
86-
float amplitude = 0.9;
105+
float amplitude = 1.0;
87106
};
88107

89108
/**

0 commit comments

Comments
 (0)