Provide generic AudioServer with AudioWAVServer as subclass

Author: pschatzmann

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

@@ -7,7 +7,7 @@
  */
 
 #include "flite_arduino.h"
-#include "AudioWAVServer.h"
+#include "AudioServer.h"
 
 using namespace audio_tools;  
 

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

@@ -1,5 +1,5 @@
 #include "AudioTools.h"
-#include "AudioWAVServer.h"
+#include "AudioServer.h"
 
 using namespace audio_tools;
 

examples/streams-sam-webserver_wav/streams-sam-webserver_wav.ino

@@ -6,7 +6,7 @@
  * 
  */
 #include "sam_arduino.h"
-#include "AudioWAVServer.h"
+#include "AudioServer.h"
 
 using namespace audio_tools;  
 

examples/streams-tts-webserver_wav/streams-tts-webserver_wav.ino

@@ -6,7 +6,7 @@
  * 
  */
 #include "TTS.h"
-#include "AudioWAVServer.h"
+#include "AudioServer.h"
 
 using namespace audio_tools;  
 

sandbox/streams-mozzi-webserver/streams-mozzi-webserver.ino

@@ -8,7 +8,7 @@
  * 
  */
 #include "AudioTools.h"
-#include "AudioWAVServer.h"
+#include "AudioServer.h"
 #include "AudioMozzi.h"
 #include <Oscil.h>
 #include <tables/cos2048_int8.h> // table for Oscils to play

src/AudioWAVServer.h renamed to src/AudioServer.h

@@ -5,29 +5,29 @@
 using namespace audio_tools;
 
 /// Calback which writes the sound data to the stream
-typedef void (*AudioWAVServerDataCallback)(Stream &out);
+typedef void (*AudioServerDataCallback)(Stream &out);
 
 /**
- * @brief A simple Arduino Webserver which streams the result as WAV file. 
+ * @brief A simple Arduino Webserver which streams the result 
  * This class is based on the WiFiServer class. All you need to do is to provide the data 
- * with a callback method or from a Stream.
+ * with a callback method or from an Arduino Stream.
  */
-class AudioWAVServer {
+class AudioServer {
 
 public:
     /**
      * @brief Construct a new Audio W A V Server object
      * We assume that the WiFi is already connected
      */
-    AudioWAVServer() = default;
+    AudioServer() = default;
 
     /**
      * @brief Construct a new Audio W A V Server object
      * 
      * @param network 
      * @param password 
      */
-    AudioWAVServer(const char* network, const char *password) {
+    AudioServer(const char* network, const char *password) {
         this->network = (char*)network;
         this->password = (char*)password;
     }
@@ -36,14 +36,11 @@ class AudioWAVServer {
      * @brief Start the server. You need to be connected to WiFI before calling this method
      * 
      * @param in 
-     * @param sample_rate 
-     * @param channels 
+     * @param contentType Mime Type of result
      */
-    void begin(Stream &in, int sample_rate, int channels, int bits_per_sample=16) {
+    void begin(Stream &in, const char* contentType) {
         this->in = ∈
-        this->sample_rate = sample_rate;
-        this->channels = channels;
-        this->bits_per_sample = bits_per_sample;
+        this->content_type = contentType;
 
         connectWiFi();
 
@@ -55,15 +52,12 @@ class AudioWAVServer {
      * @brief Start the server. The data must be provided by a callback method
      * 
      * @param cb 
-     * @param sample_rate 
-     * @param channels 
+     * @param contentType Mime Type of result
      */
-    void begin(AudioWAVServerDataCallback cb, int sample_rate, int channels, int bits_per_sample=16) {
+    void begin(AudioServerDataCallback cb, const char* contentType) {
         this->in =nullptr;
         this->callback = cb;
-        this->sample_rate = sample_rate;
-        this->channels = channels;
-        this->bits_per_sample = bits_per_sample;
+        this->content_type = contentType;
 
         connectWiFi();
 
@@ -94,12 +88,12 @@ class AudioWAVServer {
             processClient();
         } else {
             // We are connected: copy input from source to wav output
-            if (encoder){
+            if (client){
                 if (callback==nullptr) {
                     LOGI("copy data...");
                     copier.copy();
                     // if we limit the size of the WAV the encoder gets automatically closed when all has been sent
-                    if (!encoder) {
+                    if (!client) {
                         LOGI("stop client...");
                         client.stop();
                         active = false;
@@ -120,16 +114,11 @@ class AudioWAVServer {
     char *password = nullptr;
     char *network = nullptr;
 
-    // Sound Generation
-    int sample_rate;
-    int channels;
-    int bits_per_sample;
-
-    AudioWAVServerDataCallback callback = nullptr;
+    // Content
+    const char *content_type;
+    AudioServerDataCallback callback = nullptr;
     Stream *in = nullptr;                    
-    StreamCopy copier;                      
-    WAVEncoder encoder;
-    AudioOutputStream wav_stream = AudioOutputStream(encoder);  // WAV output stream
+    StreamCopy copier;
 
     void connectWiFi() {
         LOGD("connectWiFi");
@@ -146,32 +135,24 @@ class AudioWAVServer {
         Serial.println(WiFi.localIP());
     }
 
-    void sendReply(){
+    virtual void sendReply(){
         LOGD("sendReply");
         // HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
         // and a content-type so the client knows what's coming, then a blank line:
         client.println("HTTP/1.1 200 OK");
-        client.println("Content-type:audio/wav");
+        client.print("Content-type:");
+        client.println(content_type);
         client.println();
 
-        // set up wav encoder
-        auto config = encoder.defaultConfig();
-        config.channels = channels;
-        config.sample_rate = sample_rate;
-        //config.data_length = data_length;
-        config.bits_per_sample = bits_per_sample;
-        config.is_streamed = true;
-        encoder.begin(client, config);
-
         if (callback!=nullptr){
             // provide data via Callback
             LOGI("sendReply - calling callback");
-            callback(wav_stream);
+            callback(client);
             client.stop();
         } else {
             // provide data for stream
             LOGI("sendReply - Returning WAV stream...");
-            copier.begin(wav_stream, *in);
+            copier.begin(client, *in);
         }
    }
 
@@ -206,3 +187,108 @@ class AudioWAVServer {
     }
 
 };
+
+
+/**
+ * @brief A simple Arduino Webserver which streams the audio PCM data result as WAV file. 
+ * This class is based on the WiFiServer class. All you need to do is to provide the data 
+ * with a callback method or from a Stream.
+ */
+class AudioWAVServer  : public AudioServer {
+
+public:
+    /**
+     * @brief Construct a new Audio W A V Server object
+     * We assume that the WiFi is already connected
+     */
+    AudioWAVServer() = default;
+
+    /**
+     * @brief Construct a new Audio W A V Server object
+     * 
+     * @param network 
+     * @param password 
+     */
+    AudioWAVServer(const char* network, const char *password) : AudioServer(network, password) {
+    }
+
+    /**
+     * @brief Start the server. You need to be connected to WiFI before calling this method
+     * 
+     * @param in 
+     * @param sample_rate 
+     * @param channels 
+     */
+    void begin(Stream &in, int sample_rate, int channels, int bits_per_sample=16) {
+        this->in = ∈
+        this->sample_rate = sample_rate;
+        this->channels = channels;
+        this->bits_per_sample = bits_per_sample;
+
+        connectWiFi();
+
+        // start server
+        server.begin();
+    }
+
+    /**
+     * @brief Start the server. The data must be provided by a callback method
+     * 
+     * @param cb 
+     * @param sample_rate 
+     * @param channels 
+     */
+    void begin(AudioServerDataCallback cb, int sample_rate, int channels, int bits_per_sample=16) {
+        this->in =nullptr;
+        this->callback = cb;
+        this->sample_rate = sample_rate;
+        this->channels = channels;
+        this->bits_per_sample = bits_per_sample;
+
+        connectWiFi();
+
+        // start server
+        server.begin();
+    }
+
+protected:
+
+    // Sound Generation
+    int sample_rate;
+    int channels;
+    int bits_per_sample;
+
+    // WAV support
+    WAVEncoder encoder;
+    AudioOutputStream wav_stream = AudioOutputStream(encoder);  // WAV output stream
+
+    void sendReply(){
+        LOGD("sendReply");
+        // HTTP headers always start with a response code (e.g. HTTP/1.1 200 OK)
+        // and a content-type so the client knows what's coming, then a blank line:
+        client.println("HTTP/1.1 200 OK");
+        client.println("Content-type:audio/wav");
+        client.println();
+
+        // set up wav encoder
+        auto config = encoder.defaultConfig();
+        config.channels = channels;
+        config.sample_rate = sample_rate;
+        //config.data_length = data_length;
+        config.bits_per_sample = bits_per_sample;
+        config.is_streamed = true;
+        encoder.begin(client, config);
+
+        if (callback!=nullptr){
+            // provide data via Callback
+            LOGI("sendReply - calling callback");
+            callback(wav_stream);
+            client.stop();
+        } else {
+            // provide data for stream
+            LOGI("sendReply - Returning WAV stream...");
+            copier.begin(wav_stream, *in);
+        }
+   }
+
+};