Fix broken AudioEffects

Author: pschatzmann

examples/examples-audiokit/player-sd-audiokit/player-sd-audiokit.ino

@@ -19,7 +19,7 @@ const char* ext="mp3";
 int speedMz = 10;
 AudioSourceSdFat source(startFilePath, ext, PIN_AUDIO_KIT_SD_CARD_CS, speedMz);
 AudioKitStream kit;
-MP3DecoderHelix decoder;  // or MP3DecoderMAD
+MP3DecoderHelix decoder;  // or change to MP3DecoderMAD
 AudioPlayer player(source, kit, decoder);
 
 void next(bool, int, void*) {

examples/examples-audiokit/streams-synthbasic2-audiokit/streams-synthbasic2-audiokit.ino

@@ -11,7 +11,7 @@
 
 AudioKitStream kit;
 SineWaveGenerator<int16_t> sine;
-AudioEffects effects(sine);
+AudioEffects<SineWaveGenerator<int16_t>> effects(sine);
 ADSRGain adsr(0.0001,0.0001, 0.9 , 0.0002);
 GeneratedSoundStream<int16_t> in(effects); 
 StreamCopy copier(kit, in); 

examples/examples-audiokit/streams-synthbasic3-audiokit/streams-synthbasic3-audiokit.ino

@@ -30,7 +30,7 @@ class SynthAction : public MidiAction {
 
 MidiBleServer ble("MidiServer", &action);
 AudioKitStream kit;
-AudioEffects effects(sine);
+AudioEffects<SineWaveGenerator<int16_t>> effects(sine);
 GeneratedSoundStream<int16_t> in(effects); 
 StreamCopy copier(kit, in); 
 

examples/examples-webserver/streams-effect-webserver_wav/streams-effect-webserver_wav.ino

@@ -27,7 +27,7 @@ float tremoloDepth = 0.5;
 
 // Audio 
 SineWaveGenerator<int16_t> sine;
-AudioEffects effects(sine);
+AudioEffects<SineWaveGenerator<int16_t>> effects(sine);
 GeneratedSoundStream<int16_t> in(effects); 
 
 // Audio Format

src/AudioEffects/AudioEffects.h

@@ -14,15 +14,22 @@ namespace audio_tools {
  * @brief AudioEffects: the template class describes the input audio to which the effects are applied: 
  * e.g. SineWaveGenerator, SquareWaveGenerator, GeneratorFromStream etc. 
  * We support only one channel of int16_t data!
+ * 
+ * We subclass the AudioEffects from GeneratorT so that we can use this class with the GeneratedSoundStream 
+ * class to output the audio.
+ *   
  * @author Phil Schatzmann
  * @copyright GPLv3
  */
 
+
 template <class GeneratorT>
-class AudioEffects  {
+class AudioEffects : public GeneratorT {
     public:
+        /// Default constructor
         AudioEffects() = default;
 
+        /// Copy constructor
         AudioEffects(AudioEffects &copy) {
             LOGI(LOG_METHOD);
             // create a copy of the source and all effects
@@ -33,15 +40,21 @@ class AudioEffects  {
             LOGI("Number of effects %d -> %d", copy.size(), this->size());
         }
 
+        /// Constructor which is assigning a generator
+        AudioEffects(GeneratorT &generator) {
+            setInput(generator);
+        }
+
+        /// Destructor
         ~AudioEffects(){
             LOGD(LOG_METHOD);
             for (int j=0;j<effects.size();j++){
                 delete effects[j];
             }
         }
-
+        
         /// Defines the input source for the raw guitar input
-        void setInput(SoundGenerator<int16_t> &in){
+        void setInput(GeneratorT &in){
             LOGD(LOG_METHOD);
             generator_obj = in;
         }
@@ -60,7 +73,7 @@ class AudioEffects  {
         }
 
         /// provides the resulting sample
-        virtual effect_t readSample() {
+        effect_t readSample() {
             effect_t input = generator_obj.readSample();
             int size = effects.size();
             for (int j=0; j<size; j++){
@@ -70,7 +83,7 @@ class AudioEffects  {
         }
 
         /// deletes all defined effects
-        virtual void clear() {
+        void clear() {
             LOGD(LOG_METHOD);
             effects.clear();
         }
@@ -110,4 +123,6 @@ class AudioEffects  {
 };
 
 
+
+
 } // namespace