Fix broken generator

pschatzmann · pschatzmann · commit 344201b6186a · 2021-07-24T19:34:05.000+02:00
diff --git a/examples-desktop/generator/generator.ino b/examples-desktop/generator/generator.ino
@@ -5,7 +5,7 @@ using namespace audio_tools;
 uint16_t sample_rate=44100;
 uint8_t channels = 1;                                     // The stream will have 2 channels 
 SineWaveGenerator<int16_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<int16_t> in(sineWave, channels);     // Stream generated from sine wave
+GeneratedSoundStream<int16_t> in(sineWave);               // Stream generated from sine wave
 DefaultStream out;                                        // On desktop we use 
 StreamCopy copier(out, in); // copy in to out
 
diff --git a/examples/streams-generator-a2dp/streams-generator-a2dp.ino b/examples/streams-generator-a2dp/streams-generator-a2dp.ino
@@ -16,7 +16,7 @@ typedef int16_t sound_t;                                  // sound will be repre
 uint16_t sample_rate=44100;
 uint8_t channels = 2;                                     // The stream will have 2 channels 
 SineWaveGenerator<sound_t> sineWave(32000);               // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<sound_t> in(sineWave, channels);     // Stream generated from sine wave
+GeneratedSoundStream<sound_t> in(sineWave);               // Stream generated from sine wave
 A2DPStream out = A2DPStream::instance() ;                 // A2DP input - A2DPStream is a singleton!
 StreamCopy copier(out, in); // copy in to out
 
@@ -30,7 +30,7 @@ void setup(void) {
   Serial.println("A2DP is connected now...");
 
   // Setup sine wave
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
 
 }
 
diff --git a/examples/streams-generator-dac/streams-generator-dac.ino b/examples/streams-generator-dac/streams-generator-dac.ino
@@ -15,7 +15,7 @@ typedef int16_t sound_t;                                   // sound will be repr
 uint16_t sample_rate=44100;
 uint8_t channels = 2;                                      // The stream will have 2 channels 
 SineWaveGenerator<sound_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<sound_t> sound(sineWave, channels);   // Stream generated from sine wave
+GeneratedSoundStream<sound_t> sound(sineWave);             // Stream generated from sine wave
 AnalogAudioStream out; 
 StreamCopy copier(out, sound);                             // copies sound into i2s
 
@@ -31,7 +31,7 @@ void setup(void) {
   out.begin(config);
 
   // Setup sine wave
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
 }
 
 // Arduino loop - copy sound to out 
diff --git a/examples/streams-generator-i2s/streams-generator-i2s.ino b/examples/streams-generator-i2s/streams-generator-i2s.ino
@@ -15,7 +15,7 @@ typedef int16_t sound_t;                                   // sound will be repr
 uint16_t sample_rate=44100;
 uint8_t channels = 2;                                      // The stream will have 2 channels 
 SineWaveGenerator<sound_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<sound_t> sound(sineWave, channels);   // Stream generated from sine wave
+GeneratedSoundStream<sound_t> sound(sineWave);   // Stream generated from sine wave
 I2SStream out; 
 StreamCopy copier(out, sound);                             // copies sound into i2s
 
@@ -28,12 +28,12 @@ void setup(void) {
   Serial.println("starting I2S...");
   I2SConfig config = out.defaultConfig(TX_MODE);
   config.sample_rate = sample_rate; 
-  config.channels = 2;
+  config.channels = channels;
   config.bits_per_sample = 16;
   out.begin(config);
 
   // Setup sine wave
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
 }
 
 // Arduino loop - copy sound to out 
diff --git a/examples/streams-generator-pwm/streams-generator-pwm.ino b/examples/streams-generator-pwm/streams-generator-pwm.ino
@@ -11,10 +11,10 @@
 using namespace audio_tools;  
 
 //int pins[] = {22, 23};
-int channels = 2;
+int channels = 1;
 uint16_t sample_rate=22000;
 SineWaveGenerator<int16_t> sineWave(32000); // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<int16_t> sound(sineWave, channels);  // Stream generated from sine wave
+GeneratedSoundStream<int16_t> sound(sineWave);  // Stream generated from sine wave
 PWMAudioStream pwm;                  
 StreamCopy copier(pwm, sound);    // copy in to out
 
@@ -24,7 +24,7 @@ void setup() {
   AudioLogger::instance().begin(Serial, AudioLogger::Warning);  
 
   // setup sine wave
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
 
   // setup PWM output
   auto config = pwm.defaultConfig();
diff --git a/examples/streams-generator-serial/streams-generator-serial.ino b/examples/streams-generator-serial/streams-generator-serial.ino
@@ -14,7 +14,7 @@ typedef int16_t sound_t;                                   // sound will be repr
 uint16_t sample_rate=44100;
 uint8_t channels = 2;                                      // The stream will have 2 channels 
 SineWaveGenerator<sound_t> sineWave(32000);                // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<sound_t> sound(sineWave, channels);   // Stream generated from sine wave
+GeneratedSoundStream<sound_t> sound(sineWave);             // Stream generated from sine wave
 CsvStream<sound_t> printer(Serial, channels);              // ASCII stream 
 StreamCopy copier(printer, sound);                         // copies sound into printer
 
@@ -24,7 +24,7 @@ void setup(void) {
   Serial.begin(115200);
 
   // Setup sine wave
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
 }
 
 
diff --git a/examples/streams-generator-webserver_wav/streams-generator-server_wav.ino b/examples/streams-generator-webserver_wav/streams-generator-server_wav.ino
@@ -13,7 +13,7 @@ const int sample_rate = 10000;
 const int channels = 1;
 
 SineWaveGenerator<int16_t> sineWave;                      // subclass of SoundGenerator with max amplitude of 32000
-GeneratedSoundStream<int16_t> in(sineWave, channels);     // Stream generated from sine wave
+GeneratedSoundStream<int16_t> in(sineWave);     // Stream generated from sine wave
 
 
 void setup() {
@@ -24,7 +24,7 @@ void setup() {
   server.begin(in, sample_rate, channels);
 
   // start generation of sound
-  sineWave.begin(sample_rate, N_B4);
+  sineWave.begin(channels, sample_rate, N_B4);
   in.begin();
 }
 
diff --git a/sandbox/experiment-mozzi-udp/streams-mozzi-udp.ino b/sandbox/experiment-mozzi-udp/streams-mozzi-udp.ino
@@ -23,7 +23,7 @@ using namespace audio_tools;
 typedef int16_t sound_t;                                  // sound will be represented as int16_t (with 2 bytes)
 uint8_t channels = 2;                                     // The stream will have 2 channels 
 MozziGenerator mozzi(CONTROL_RATE);                       // subclass of SoundGenerator 
-GeneratedSoundStream<sound_t> in(mozzi, channels);        // Stream generated with mozzi
+GeneratedSoundStream<sound_t> in(mozzi);        // Stream generated with mozzi
 UDPStream out;                                            // UDP Output - A2DPStream is a singleton!
 StreamCopy copier(out, in); // copy in to out
 
diff --git a/sandbox/experiment-mozzi-usb/streams-mozzi-usb.ino b/sandbox/experiment-mozzi-usb/streams-mozzi-usb.ino
@@ -22,7 +22,7 @@ using namespace audio_tools;
 typedef int16_t sound_t;                                  // sound will be represented as int16_t (with 2 bytes)
 uint8_t channels = 2;                                     // The stream will have 2 channels 
 MozziGenerator mozzi(CONTROL_RATE);                       // subclass of SoundGenerator 
-GeneratedSoundStream<sound_t> in(mozzi, channels);        // Stream generated with mozzi
+GeneratedSoundStream<sound_t> in(mozzi);        // Stream generated with mozzi
 AudioUSB out;                                            // UDP Output - A2DPStream is a singleton!
 StreamCopy copier(out, in); // copy in to out
 
diff --git a/src/AudioTools.h b/src/AudioTools.h
@@ -43,7 +43,7 @@ namespace audio_tools {
 #if defined(__linux__) || defined(_WIN32) || defined(__APPLE__)
 typedef PortAudioStream DefaultStream;
 #elif defined(ESP32) || defined(ESP8266) || defined(__SAMD21G18A__)
-typedef A2DPStream DefaultStream;
+typedef I2SStream DefaultStream;
 #endif
 
 }
diff --git a/src/AudioTools/SoundGenerator.h b/src/AudioTools/SoundGenerator.h
@@ -46,7 +46,7 @@ class SoundGenerator  {
 
         /// Provides the data as byte array with the requested number of channels
         virtual size_t readBytes( uint8_t *buffer, size_t lengthBytes){
-            LOGD("readBytes: %d - channesl = %d",lengthBytes);
+            LOGD("readBytes: %d - channesl = %d", lengthBytes);
             size_t result = 0;
             int ch = channels();
             int frame_size = sizeof(T) * ch;
@@ -132,6 +132,7 @@ class SineWaveGenerator : public SoundGenerator<T> {
 
         void begin(int channels, uint16_t sample_rate, uint16_t frequency=0){
             LOGI("SineWaveGenerator::begin");
+            this->setChannels(channels);
             this->m_frequency = frequency;
             this->m_sample_rate = sample_rate;
             this->m_deltaTime = 1.0 / m_sample_rate;
@@ -163,6 +164,7 @@ class SineWaveGenerator : public SoundGenerator<T> {
         float double_Pi = PI * 2.0;
 
         void logStatus() {
+            LOGI( "channels: %d", this->channels() );
             LOGI( "frequency: %f", this->m_frequency );
             LOGI( "sample rate: %u", this->m_sample_rate );
             LOGI( "amplitude: %f", this->m_amplitude );
diff --git a/src/AudioTools/Streams.h b/src/AudioTools/Streams.h
@@ -133,10 +133,9 @@ class MemoryStream : public Stream {
 template <class T>
 class GeneratedSoundStream : public Stream {
     public:
-        GeneratedSoundStream(SoundGenerator<T> &generator, uint8_t channels=2){
-            LOGD("GeneratedSoundStream channels: %d", channels);
+        GeneratedSoundStream(SoundGenerator<T> &generator){
+	 		LOGD(__FUNCTION__);
             this->generator_ptr = &generator;
-            this->channels = channels;
         }
         
         /// unsupported operations
@@ -169,7 +168,7 @@ class GeneratedSoundStream : public Stream {
         /// privide the data as byte stream
         size_t readBytes( char *buffer, size_t length) {
             LOGD("GeneratedSoundStream::readBytes: %zu", length);
-            return generator_ptr->readBytes((uint8_t*)buffer, length, channels);
+            return generator_ptr->readBytes((uint8_t*)buffer, length);
         }
 
         /// start the processing
@@ -189,7 +188,6 @@ class GeneratedSoundStream : public Stream {
 
     protected:
         SoundGenerator<T> *generator_ptr;  
-        uint8_t channels; 
 
         int not_supported() {
             LOGE("GeneratedSoundStream-unsupported operation!");

Original file line number	Diff line number	Diff line change
`@@ -43,7 +43,7 @@ namespace audio_tools {`
`43`	`43`	`#if defined(__linux__) \|\| defined(_WIN32) \|\| defined(__APPLE__)`
`44`	`44`	`typedef PortAudioStream DefaultStream;`
`45`	`45`	`#elif defined(ESP32) \|\| defined(ESP8266) \|\| defined(__SAMD21G18A__)`
`46`		`-typedef A2DPStream DefaultStream;`
	`46`	`+typedef I2SStream DefaultStream;`
`47`	`47`	`#endif`
`48`	`48`
`49`	`49`	`}`