AudioEffects issue#86

Author: pschatzmann

src/AudioEffects/AudioEffects.h

@@ -33,7 +33,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
         AudioEffects(AudioEffects &copy) {
             LOGI(LOG_METHOD);
             // create a copy of the source and all effects
-            generator_obj = copy.generator_obj;
+            p_generator = copy.p_generator;
             for (int j=0;j<copy.size();j++){
                 effects.push_back(copy[j]->clone());
             }
@@ -56,7 +56,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
         /// Defines the input source for the raw guitar input
         void setInput(GeneratorT &in){
             LOGD(LOG_METHOD);
-            generator_obj = in;
+            p_generator = &in;
             // automatically activate this object
             AudioBaseInfo info;
             info.channels = 1;
@@ -79,10 +79,13 @@ class AudioEffects : public SoundGenerator<effect_t> {
 
         /// provides the resulting sample
         effect_t readSample() override {
-            effect_t sample = generator_obj.readSample();
-            int size = effects.size();
-            for (int j=0; j<size; j++){
-                sample = effects[j]->process(sample);
+            effect_t sample;
+            if (p_generator!=nullptr){
+                sample  = p_generator->readSample();
+                int size = effects.size();
+                for (int j=0; j<size; j++){
+                    sample = effects[j]->process(sample);
+                }
             }
             return sample;
         }
@@ -100,7 +103,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
 
         /// Provides access to the sound generator
         GeneratorT &generator(){
-            return generator_obj;
+            return p_generator;
         }
 
         /// gets an effect by index
@@ -124,7 +127,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
 
     protected:
         Vector<AudioEffect*> effects;
-        GeneratorT generator_obj;
+        GeneratorT *p_generator=nullptr;
 };
 
 

src/AudioEffects/SoundGenerator.h

@@ -200,6 +200,7 @@ class SineWaveGenerator : public SoundGenerator<T>{
         /// Defines the frequency - after the processing has been started
         void setFrequency(uint16_t frequency)  override {
             LOGI("setFrequency: %d", frequency);
+            LOGI( "active: %s", SoundGenerator<T>::active ? "true" : "false" );
             m_frequency = frequency;
         }
 

tests/effects/effects.cpp

@@ -12,12 +12,12 @@ ADSRGain adsr(0.0001,0.0001, 0.9 , 0.0002);
 GeneratedSoundStream<int16_t> in(effects); 
 StreamCopy copier(out, in); 
 uint64_t timeout=0;
-int freq = N_C3;
+int freq = N_C4;
 
 
 void setup() {
   Serial.begin(115200);
-  AudioLogger::instance().begin(Serial,AudioLogger::Info);
+  AudioLogger::instance().begin(Serial,AudioLogger::Warning);
 
   // setup effects
   effects.addEffect(adsr);
@@ -47,7 +47,7 @@ void loop() {
   // simulate key release
   if (millis()>timeout+1000){
     sine.setFrequency(freq);
-    adsr.keyOn();
+    adsr.keyOff();
   }
   // output audio
   copier.copy();