Jupyter support

Author: pschatzmann

src/AudioConfig.h

@@ -490,6 +490,7 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 
 #ifdef IS_DESKTOP
 #define USE_URL_ARDUINO
+#define USE_STREAM_WRITE_OVERRIDE
 #endif
 
 #ifndef ARDUINO

src/AudioHttp/AbstractURLStream.h

@@ -5,22 +5,23 @@ namespace audio_tools {
 /**
  * @brief Abstract Base class for all URLStream implementations
  * @author Phil Schatzmann
+ * @ingroup http
  * @copyright GPLv3
  */
 class AbstractURLStream : public AudioStream  {
     public:
         // executes the URL request
         virtual bool begin(const char* urlStr, const char* acceptMime=nullptr, MethodID action=GET,  const char* reqMime="", const char*reqData="") = 0;
         // ends the request
-        virtual void end()=0;
+        virtual void end() override =0;
         /// provides access to the HttpRequest
         virtual HttpRequest &httpRequest()=0;
         // only the ICYStream supports this
         virtual bool setMetadataCallback(void (*fn)(MetaDataType info, const char* str, int len)) {
             return false;
         }
         /// Writes are not supported
-        int availableForWrite() {
+        int availableForWrite() override {
             return 0;
         }
 

src/AudioLibs/Jupyter/JupyterAudio.h

@@ -25,6 +25,9 @@ class FilePrint : public Print {
          p_audio_stream->write((const char*)buffer,size);
          return size;
     }
+    int availableForWrite() override {
+      return 1024;
+    }
 protected:
     std::fstream *p_audio_stream=nullptr;
 };
@@ -128,15 +131,17 @@ class JupyterAudioT : public AudioStreamX {
 
   // fills a wav file with data once, the first time it was requested
   void createWAVFile(){
-    if (!fileExists()){
-        std::fstream fstream(fname, fstream.binary | fstream.trunc | fstream.out);
-        FilePrint fp(fstream);
-        WAVEncoder wave_encoder;
-        EncodedAudioStream out(&fp, &wave_encoder); // output to decoder
-        out.begin(cfg);
-        StreamCopyT<T> copier(out, *p_audio_stream, buffer_count);
-        copier.copyN(buffer_count);
-        fstream.close();
+    try{
+      if (!fileExists()){
+          std::fstream fstream(fname, fstream.binary | fstream.trunc | fstream.out);
+          FilePrint fp(fstream);
+          out.begin(&fp, &wave_encoder); // output to decoder
+          copier.begin(out, *p_audio_stream);
+          copier.copyN(buffer_count);
+          fstream.close();
+      }
+    } catch(const std::exception& ex){
+        std::cerr << ex.what();
     }
   }
 
@@ -165,6 +170,9 @@ class JupyterAudioT : public AudioStreamX {
 protected:
   AudioStream *p_audio_stream=nullptr;
   ChartT<T> chrt;
+  WAVEncoder wave_encoder;
+  EncodedAudioPrint out;
+  StreamCopyT<T> copier;
   AudioBaseInfo cfg;
   string fname;
   size_t buffer_count=0;

src/AudioTools/AudioPrint.h

@@ -10,7 +10,7 @@
 
 namespace audio_tools {
 
-#ifndef ARDUINO
+#if !defined(ARDUINO) || defined(IS_DESKTOP)
 #  define FLUSH_OVERRIDE override
 #else
 #  define FLUSH_OVERRIDE