SAMD - AudioEffects - cleanup

Author: pschatzmann

examples/build-examples-log.txt

@@ -1,7 +1,7 @@
 
 ../examples/examples-basic-api/base-adc-a2dp -> rc=0
 ../examples/examples-basic-api/base-adc-serial -> rc=0
-../examples/examples-basic-api/base-file_mp3-a2dp -> rc=0
+../examples/examples-basic-api/base-file_mp3-a2dp -> rc=1
 ../examples/examples-basic-api/base-file_raw-a2dp -> rc=0
 ../examples/examples-basic-api/base-file_raw-serial -> rc=0
 ../examples/examples-basic-api/base-i2s-a2dp -> rc=0
@@ -19,21 +19,19 @@
 ../examples/examples-webserver/streams-i2s-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-sam-webserver_wav -> rc=0
 ../examples/examples-webserver/streams-tts-webserver_wav -> rc=0
+../examples/examples-stream/streams-adc-i2s -> rc=0
 ../examples/examples-stream/streams-adc-serial -> rc=0
-../examples/examples-stream/streams-analog-i2s -> rc=0
-../examples/examples-stream/streams-analog-serial -> rc=0
 ../examples/examples-stream/streams-generator-a2dp -> rc=0
 ../examples/examples-stream/streams-generator-analog -> rc=0
-../examples/examples-stream/streams-generator-csv -> rc=0
 ../examples/examples-stream/streams-generator-i2s -> rc=0
 ../examples/examples-stream/streams-generator-pwm -> rc=0
 ../examples/examples-stream/streams-generator-serial -> rc=0
 ../examples/examples-stream/streams-generator-spdif -> rc=0
 ../examples/examples-stream/streams-i2s-a2dp -> rc=0
-../examples/examples-stream/streams-i2s-csv -> rc=0
 ../examples/examples-stream/streams-i2s-filter-i2s -> rc=0
 ../examples/examples-stream/streams-i2s-i2s -> rc=0
 ../examples/examples-stream/streams-i2s-i2s-2 -> rc=0
+../examples/examples-stream/streams-i2s-serial -> rc=0
 ../examples/examples-stream/streams-memory_mp3-analog -> rc=0
 ../examples/examples-stream/streams-memory_mp3-metadata -> rc=0
 ../examples/examples-stream/streams-memory_mp3-pwm -> rc=0
@@ -42,6 +40,7 @@
 ../examples/examples-stream/streams-memory_raw-i2s -> rc=0
 ../examples/examples-stream/streams-memory_wav-pwm -> rc=0
 ../examples/examples-stream/streams-memory_wav-serial -> rc=0
+../examples/examples-stream/streams-mp34dt05-serial -> rc=1
 ../examples/examples-stream/streams-sd_mp3-i2s -> rc=0
 ../examples/examples-stream/streams-sd_mp3-metadata -> rc=0
 ../examples/examples-stream/streams-url_mp3-analog -> rc=0
@@ -56,8 +55,8 @@
 ../examples/examples-audiokit/player-sd_a2dp-audiokit -> rc=0
 ../examples/examples-audiokit/player-url_icy-audiokit -> rc=0
 ../examples/examples-audiokit/streams-audiokit-audiokit -> rc=0
-../examples/examples-audiokit/streams-audiokit-csv -> rc=0
 ../examples/examples-audiokit/streams-audiokit-filter-audiokit -> rc=0
+../examples/examples-audiokit/streams-audiokit-serial -> rc=0
 ../examples/examples-audiokit/streams-audiokit-webserver_aac -> rc=0
 ../examples/examples-audiokit/streams-audiokit-webserver_wav -> rc=0
 ../examples/examples-audiokit/streams-flite-audiokit -> rc=0

examples/examples-basic-api/base-file_mp3-a2dp/README.md

@@ -9,7 +9,6 @@
 
 // Add this in your sketch or change the setting in AudioConfig.h
 #define USE_A2DP
-#define USE_ESP8266_AUDIO
 
 #include <SPI.h>
 #include <SD.h>
@@ -77,4 +76,4 @@ void loop() {
     Serial.println("MP3 done");
     delay(10000);
   }
-}
+}

examples/examples-basic-api/base-file_mp3-a2dp/base-file_mp3-a2dp.ino

@@ -152,6 +152,7 @@
 #define USE_URLSTREAM_TASK
 #define USE_TYPETRAITS
 #define USE_EFFECTS_SUITE
+#define USE_TIMER
 
 #define PWM_FREQENCY 30000
 #define PIN_PWM_START 12
@@ -202,6 +203,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_AUDIO_SERVER
 #define USE_TYPETRAITS
 #define USE_EFFECTS_SUITE
+#define USE_TIMER
 //#define USE_ESP8266_AUDIO
 
 #define PIN_PWM_START 12
@@ -221,6 +223,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_PWM
 #define USE_TYPETRAITS
 #define USE_EFFECTS_SUITE
+#define USE_TIMER
 
 #define PIN_PWM_START 6
 #define PIN_I2S_BCK 2
@@ -239,6 +242,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_ADC_ARDUINO
 #define USE_TYPETRAITS
 #define USE_EFFECTS_SUITE
+#define USE_TIMER
 
 #define PIN_ADC_START 26
 #define PIN_PWM_START 6
@@ -270,6 +274,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define USE_ADC_ARDUINO
 #define USE_TYPETRAITS
 #define USE_EFFECTS_SUITE
+#define USE_TIMER
 
 #define PIN_ADC_START 26
 #define PIN_PWM_START 6
@@ -300,6 +305,8 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 //----------------
 #ifdef __AVR__
 #define USE_PWM
+#define USE_TIMER
+
 #define assert(T)
 #define rintf(F) static_cast<int>(F)
 #define PIN_PWM_START 6
@@ -328,6 +335,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #ifdef STM32
 #define USE_I2S
 #define USE_PWM
+#define USE_TIMER
 
 #define PIN_PWM_START 6
 #define PIN_I2S_BCK 1
@@ -339,9 +347,21 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 #define PIN_CS 10
 #endif
 
+//----------------
+
+#ifdef ARDUINO_ARCH_SAMD
+#define USE_I2S
+#define PIN_I2S_BCK 1
+#define PIN_I2S_WS PIN_I2S_BCK+1
+#define PIN_I2S_DATA_IN 3
+#define PIN_I2S_DATA_OUT 3
+#define PIN_I2S_MUTE 4
+#define SOFT_MUTE_VALUE LOW  
+#endif
 
 //----------------
 
+
 #ifdef IS_DESKTOP
 #define USE_URL_ARDUINO
 #define FLUSH_OVERRIDE override

examples/examples-basic-api/base-file_raw-a2dp/README.md

@@ -47,9 +47,19 @@ class AudioEffects : public SoundGenerator<effect_t> {
             setInput(generator);
         }
 
+        /// Constructor which is assigning a Stream as input. The stream must consist of int16_t values 
+        /// with the indicated number of channels
+        AudioEffects(Stream &input, int channels=2, float volume=1.0) {
+            setInput(* (new GeneratorFromStream<effect_t>(input, channels, volume)));
+            owns_generator = true;
+        }
+
         /// Destructor
         virtual ~AudioEffects(){
             LOGD(LOG_METHOD);
+            if (owns_generator && p_generator!=nullptr){
+                delete p_generator;
+            }
             for (int j=0;j<effects.size();j++){
                 delete effects[j];
             }
@@ -130,6 +140,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
     protected:
         Vector<AudioEffect*> effects;
         GeneratorT *p_generator=nullptr;
+        bool owns_generator = false;
 };