correct CsvOutput examples

Author: pschatzmann

examples/examples-audiokit/streams-audiokit-multioutput/streams-audiokit-multioutput.ino

@@ -12,8 +12,9 @@
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
 
+AudioInfo info(8000, 2, 16);
 AudioKitStream kit; // Access I2S as stream
-CsvOutput<int16_t> csv(Serial,2);
+CsvOutput<int16_t> csv(Serial);
 MultiOutput out;
 StreamCopy copier(out, kit); // copy kit to kit
 
@@ -26,11 +27,13 @@ void setup(void) {
     out.add(kit);
 
     auto cfg = kit.defaultConfig(RXTX_MODE);
+    cfg.copyFrom(info);
     cfg.sd_active = false;
     cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2; // input from microphone
-    cfg.sample_rate = 8000;
     kit.setVolume(0.5);
     kit.begin(cfg);
+
+    csv.begin(info);
 }
 
 // Arduino loop - copy data

examples/examples-audiokit/streams-audiokit-serial/streams-audiokit-serial.ino

@@ -11,6 +11,7 @@
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
 
+AudioInfo info(44100, 2, 16);
 AudioKitStream kit; // Access I2S as stream
 CsvOutput<int16_t> csvStream(Serial);
 StreamCopy copier(csvStream, kit); // copy kit to csvStream
@@ -21,11 +22,12 @@ void setup(void) {
     AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
     auto cfg = kit.defaultConfig(RX_MODE);
+    cfg.copyFrom(info);
     cfg.input_device = AUDIO_HAL_ADC_INPUT_LINE2;
     kit.begin(cfg);
 
     // make sure that we have the correct channels set up
-    csvStream.begin();
+    csvStream.begin(info);
 
 }
 

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

@@ -10,7 +10,7 @@
 
 #include "AudioTools.h"
 
-
+AudioInfo info(44100, 2, 16);
 I2SStream i2sStream; // Access I2S as stream
 CsvOutput<int16_t> csvStream(Serial);
 StreamCopy copier(csvStream, i2sStream); // copy i2sStream to csvStream
@@ -21,18 +21,16 @@ void setup(void) {
     AudioLogger::instance().begin(Serial, AudioLogger::Info);
 
     auto cfg = i2sStream.defaultConfig(RX_MODE);
+    cfg.copyFrom(info);
     cfg.i2s_format = I2S_STD_FORMAT; // or try with I2S_LSB_FORMAT
-    cfg.bits_per_sample = 16;
-    cfg.channels = 2;
-    cfg.sample_rate = 44100;
     cfg.is_master = true;
      // this module nees a master clock if the ESP32 is master
     cfg.use_apll = false;  // try with yes
     //cfg.pin_mck = 3; 
     i2sStream.begin(cfg);
 
     // make sure that we have the correct channels set up
-    csvStream.begin(cfg);
+    csvStream.begin(info);
 
 }
 

examples/examples-vs1053/streams-vs1053-serial/streams-vs1053-serial.ino

@@ -11,9 +11,9 @@
 #include "AudioTools.h"
 #include "AudioLibs/VS1053Stream.h"
 
-int channels = 1;
+AudioInfo info(1600, 1, 16);
 VS1053Stream in; // Access VS1053/VS1003 as stream
-CsvOutput<int16_t> csvStream(Serial, channels);
+CsvOutput<int16_t> csvStream(Serial);
 StreamCopy copier(csvStream, in); // copy in to csvStream
 
 // Arduino Setup
@@ -22,13 +22,12 @@ void setup(void) {
     AudioLogger::instance().begin(Serial, AudioLogger::Warning);
 
     auto cfg = in.defaultConfig(RX_MODE);
-    cfg.sample_rate = 16000;
-    cfg.channels = channels;
+    cfg.copyFrom(info);
     cfg.input_device = VS1053_MIC; // or VS1053_AUX
     in.begin(cfg);
 
     // make sure that we have the correct channels set up
-    csvStream.begin();
+    csvStream.begin(info);
 
 }
 

examples/tests/effects/delay-in/delay-in.ino

@@ -1,29 +1,26 @@
 #include "AudioTools.h"
 
-int channels = 1;
-int rate = 44100;
 int hz = 200;
+AudioInfo info(44100, 1, 16);
 SineWaveGenerator<int16_t> sine;
 GeneratedSoundStream<int16_t> gen(sine); 
 AudioEffectStream effects(gen); // apply effects to input: reading from gen
 CsvOutput<int16_t> out(Serial);
 StreamCopy copier(out, effects); 
-Delay dly(998, 0.5, 1.0,rate, true);
+Delay dly(998, 0.5, 1.0, info.sample_rate, true);
 
 
 void setup() {
   Serial.begin(115200);
+  
   // setup effects
   effects.addEffect(dly);
 
   // Setup audio objects
-  auto cfg = out.defaultConfig();
-  cfg.channels = channels;
-  cfg.sample_rate = rate;
-  out.begin(cfg);
-  sine.begin(cfg, hz);
-  gen.begin(cfg);
-  effects.begin(cfg);
+  out.begin(info);
+  sine.begin(info, hz);
+  gen.begin(info);
+  effects.begin(info);
 }
 // copy the data
 void loop() {

examples/tests/effects/delay-out/delay-out.ino

@@ -1,7 +1,6 @@
 #include "AudioTools.h"
 
-int channels = 1;
-int rate = 44100;
+AudioInfo info(44100, 1, 16);
 int hz = 200;
 SineWaveGenerator<int16_t> sine;
 GeneratedSoundStream<int16_t> gen(sine); 
@@ -17,13 +16,10 @@ void setup() {
   effects.addEffect(dly);
 
   // Setup audio objects
-  auto cfg = csv.defaultConfig();
-  cfg.channels = channels;
-  cfg.sample_rate = rate;
-  csv.begin(cfg);
-  sine.begin(cfg, hz);
-  gen.begin(cfg);
-  effects.begin(cfg);
+  csv.begin(info);
+  sine.begin(info, hz);
+  gen.begin(info);
+  effects.begin(info);
 }
 // copy the data
 void loop() {

examples/tests/pitch-shift/pitch-shift-180/pitch-shift-180.ino

@@ -6,7 +6,7 @@ float pitch_shift = 1.5;
 AudioInfo info(44100, 1, 16);
 SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
-CsvOutput<int16_t> out(Serial, 1); 
+CsvOutput<int16_t> out(Serial); 
 //PitchShiftOutput<int16_t, VariableSpeedRingBufferSimple<int16_t>> pitchShift(out);
 PitchShiftOutput<int16_t, VariableSpeedRingBuffer180<int16_t>> pitchShift(out);
 //PitchShiftOutput<int16_t, VariableSpeedRingBuffer<int16_t>> pitchShift(out);

examples/tests/pitch-shift/pitch-shift-simple/pitch-shift-simple.ino

@@ -6,7 +6,7 @@ float pitch_shift = 1.5;
 AudioInfo info(44100, 1, 16);
 SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
-CsvOutput<int16_t> out(Serial, 1); 
+CsvOutput<int16_t> out(Serial); 
 PitchShiftOutput<int16_t, VariableSpeedRingBufferSimple<int16_t>> pitchShift(out);
 //PitchShiftOutput<int16_t, VariableSpeedRingBuffer180<int16_t>> pitchShift(out);
 //PitchShiftOutput<int16_t, VariableSpeedRingBuffer<int16_t>> pitchShift(out);

examples/tests/pitch-shift/pitch-shift/pitch-shift.ino

@@ -6,7 +6,7 @@ float pitch_shift = 1.5;
 AudioInfo info(44100, 1, 16);
 SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
-CsvOutput<int16_t> out(Serial, 1); 
+CsvOutput<int16_t> out(Serial); 
 //PitchShiftOutput<int16_t, VariableSpeedRingBufferSimple<int16_t>> pitchShift(out);
 //PitchShiftOutput<int16_t, VariableSpeedRingBuffer180<int16_t>> pitchShift(out);
 PitchShiftOutput<int16_t, VariableSpeedRingBuffer<int16_t>> pitchShift(out);

examples/tests/test-resample-in/test-resample-in.ino

@@ -1,11 +1,11 @@
 #include "AudioTools.h"
 
+AudioInfo info(44100,2,16);
 SineWaveGenerator<int16_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
 GeneratedSoundStream<int16_t> sound(sineWave);             // Stream generated from sine wave
 ResampleStream resample(sound);
 CsvOutput<int16_t> out(Serial); 
 StreamCopy copier(out, resample);                        // copies sound to out
-AudioInfo info(44100,2,16);
 
 // Arduino Setup
 void setup(void) {  
@@ -20,9 +20,7 @@ void setup(void) {
   resample.begin(rcfg); 
 
   // Define CSV Output
-  auto config = out.defaultConfig();
-  config.copyFrom(info);
-  out.begin(config);
+  out.begin(info);
 
   // Setup sine wave
   sineWave.begin(info, N_B4);