Merge branch 'main' of https://github.com/pschatzmann/arduino-audio-tools

Author: pschatzmann

examples/examples-audiokit/streams-pins-audiokit/streams-pins-audiokit.ino

@@ -10,8 +10,6 @@
 #include "AudioLibs/AudioKit.h"
 #include "flite_arduino.h"
 
-using namespace audio_tools;
-
 AudioKitStream kit; 
 Flite flite(kit);
 

examples/examples-tts/streams-flite-audiokit/streams-flite-audiokit.ino

@@ -10,8 +10,6 @@
 #include "AudioTools.h"
 #include "AudioLibs/AudioKit.h"
 
-using namespace audio_tools;
-
 AudioKitStream kit;
 Flite flite(kit);
 

examples/examples-tts/streams-sam-audiokit/streams-sam-audiokit.ino

@@ -10,8 +10,6 @@
 #include "AudioLibs/AudioKit.h"
 #include "sam_arduino.h"
 
-using namespace audio_tools;
-
 AudioKitStream kit;
 SAM sam(kit);
 

examples/examples-webserver/player-sd-webserverex_mp3/README.md

@@ -0,0 +1,25 @@
+# A Simple SdFat Audio Player
+
+The example demonstrates how to implement an __MP3 Player__: which provides the data from a SD drive and provides the audio via a Webserver!
+
+## SD Card
+
+Here is the information how to wire the SD card to the ESP32
+
+| SD    | ESP32 
+|-------|-----------------------
+| CS    | VSPI-CS0 (GPIO 05) 
+| SCK   | VSPI-CLK (GPIO 18) 
+| MOSI  | VSPI-MOSI (GPIO 23) 
+| MISO  | VSPI-MISO (GPIO 19) 
+| VCC   | VIN (5V) 
+| GND   | GND 
+
+![SD](https://www.pschatzmann.ch/wp-content/uploads/2021/04/sd-module.jpeg)
+
+
+## Dependencies
+
+- https://github.com/pschatzmann/arduino-audio-tools
+- https://github.com/pschatzmann/TinyHttp.git
+- Arduino SD library

examples/examples-webserver/player-sd-webserverex_mp3/player-sd-webserverex_mp3.ino

@@ -0,0 +1,43 @@
+/**
+ * @file player-sdfat-a2dp.ino
+ * @brief see https://github.com/pschatzmann/arduino-audio-tools/blob/main/examples/examples-player/player-sdfat-a2dp/README.md
+ * 
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ */
+
+
+#include "AudioTools.h"
+#include "AudioLibs/AudioSourceSD.h"
+#include "AudioLibs/AudioServerEx.h"
+#include "AudioCodecs/CodecCopy.h"
+
+const char *ssid = "SSID";
+const char *password = "PWD";
+const char *startFilePath="/";
+const char* ext="mp3";
+AudioSourceSD source(startFilePath, ext);
+AudioServerEx out;
+AudioPlayer player(source, out, *new CopyDecoder());
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial, AudioLogger::Warning);
+
+  // setup output - We need to login and serve the data as audio/mp3
+  auto cfg = out.defaultConfig();
+  cfg.password = password;
+  cfg.ssid = ssid;
+  cfg.mime = "audio/mp3";
+  out.begin(cfg);
+
+  // setup player
+  player.setVolume(1.0);
+  player.begin();
+
+}
+
+void loop() {
+  player.copy();
+  out.copy();
+}

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

@@ -10,8 +10,6 @@
 
 #include "AudioTools.h"
 
-using namespace audio_tools;
-
 // WIFI
 const char *ssid = "ssid";
 const char *password = "password";
@@ -57,5 +55,5 @@ void setup() {
 
 // copy the data
 void loop() {
-  server.doLoop();
+  server.copy();
 }

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

@@ -9,8 +9,6 @@
 #include "flite_arduino.h"
 #include "AudioTools.h"
 
-
-
 AudioWAVServer server("ssid","password");
 
 // Callback which provides the audio data 
@@ -34,5 +32,5 @@ void setup(){
 // Arduino loop  
 void loop() {
   // Handle new connections
-  server.doLoop();  
+  server.copy();  
 }

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

@@ -10,8 +10,6 @@
 
 #include "AudioTools.h"
 
-using namespace audio_tools;
-
 // WIFI
 const char *ssid = "ssid";
 const char *password = "password";
@@ -41,5 +39,5 @@ void setup() {
 
 // copy the data
 void loop() {
-  server.doLoop();
+  server.copy();
 }

examples/examples-webserver/streams-generator-webserverex_wav/README.md

@@ -0,0 +1,11 @@
+# Webserver
+
+With the help of the ESP32 WIFI functionality we can implement a simple web server. 
+In the example we use a Sine Wave generator as sound source and return the result as an WAV file
+
+Multiple users can connect to the server!
+
+## Dependencies
+
+- https://github.com/pschatzmann/arduino-audio-tools
+- https://github.com/pschatzmann/TinyHttp.git

examples/examples-webserver/streams-generator-webserverex_wav/streams-generator-webserverex_wav.ino

@@ -0,0 +1,47 @@
+/**
+ * @file streams-generator-server_wav.ino
+ *
+ *  This sketch generates a test sine wave. The result is provided as WAV stream which can be listened to in a Web Browser
+ *
+ * @author Phil Schatzmann
+ * @copyright GPLv3
+ * 
+ */
+
+#include "AudioTools.h"
+#include "AudioLibs/AudioServerEx.h"
+
+// WIFI
+const char *ssid = "ssid";
+const char *password = "password";
+AudioWAVServerEx server;
+// Sound Generation
+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);     // Stream generated from sine wave
+
+
+void setup() {
+  Serial.begin(115200);
+  AudioLogger::instance().begin(Serial,AudioLogger::Info);
+
+  // start server
+  auto cfg = server.defaultConfig();
+  cfg.sample_rate = sample_rate;
+  cfg.channels = channels;
+  cfg.ssid = ssid;
+  cfg.password = password; 
+  cfg.input = &in;
+  server.begin(cfg);
+
+  // start generation of sound
+  sineWave.begin(channels, sample_rate, N_B4);
+  in.begin();
+}
+
+
+// copy the data
+void loop() {
+  server.copy();
+}