Correct compile errors for tests

Author: pschatzmann

src/AudioCodecs/CodecHelix.h

@@ -59,7 +59,7 @@ class DecoderHelix : public AudioDecoder {
   size_t write(const void *data, size_t len) {
     LOGD("%s: %zu", LOG_METHOD, len);
     if (p_decoder == nullptr) {
-      setupDecoder((const char *)data);
+      setupDecoder((const byte *)data);
       p_decoder->begin();
     }
     return p_decoder->write(data, len);
@@ -79,14 +79,14 @@ class DecoderHelix : public AudioDecoder {
   AudioBaseInfo noInfo;
 
   /// Defines the decoder based on the audio format
-  void setupDecoder(const char *start) {
+  void setupDecoder(const byte *start) {
     if (start[0] == 0xFF && start[1] == 0xF1) {
       p_decoder = new AACDecoderHelix();
       LOGI("using AACDecoderHelix");
-    } else if (start[0] == 0xFF || start[0] == 0xFE || strncmp("ID3", start, 3)==0) {
+    } else if (start[0] == 0xFF || start[0] == 0xFE || strncmp("ID3", (const char*)start, 3)==0) {
       p_decoder = new MP3DecoderHelix();
       LOGI("using MP3DecoderHelix");
-    } else if (strncmp("RIFF", start, 4)==0) {
+    } else if (strncmp("RIFF", (const char*)start, 4)==0) {
       p_decoder = new WAVDecoder();
       LOGI("using WAVDecoder");
     }

src/AudioCodecs/CodecMP3LAME.h

@@ -31,7 +31,7 @@ class MP3EncoderLAME : public AudioEncoder {
         enc = new liblame::MP3EncoderLAME();
     }
 
-    MP3EncoderLAME(Stream &out_stream){
+    MP3EncoderLAME(Print &out_stream){
         LOGD(LOG_METHOD);
         enc = new liblame::MP3EncoderLAME(out_stream);
     }

src/AudioCodecs/CodecWAV.h

@@ -52,7 +52,7 @@ class WAVHeader  {
             this->len = len;
             this->data_pos = 0l;
 
-            memset(&headerInfo, 0, sizeof(WAVAudioInfo));
+            memset((void*)&headerInfo, 0, sizeof(WAVAudioInfo));
             while (!eof()) {
                 uint32_t tag, tag2, length;
                 tag = read_tag();

src/AudioConfig.h

@@ -270,11 +270,6 @@ typedef uint32_t eps32_i2s_sample_rate_type;
 
 
 //----------------
-#if defined(__linux__) || defined(_WIN32) || defined(__APPLE__)
-#define USE_URL_ARDUINO
-#define IS_DESKTOP
-#endif
-
 
 #ifdef IS_DESKTOP
 #define USE_URL_ARDUINO

src/AudioEffects/AudioEffect.h

@@ -16,6 +16,9 @@ typedef int16_t effect_t;
 
 class AudioEffect  {
     public:
+        AudioEffect() = default;
+        virtual ~AudioEffect() = default;
+        
         /// calculates the effect output from the input
         virtual effect_t process(effect_t in) = 0;
 

src/AudioEffects/AudioEffects.h

@@ -46,7 +46,7 @@ class AudioEffects : public SoundGenerator<effect_t> {
         }
 
         /// Destructor
-        ~AudioEffects(){
+        virtual ~AudioEffects(){
             LOGD(LOG_METHOD);
             for (int j=0;j<effects.size();j++){
                 delete effects[j];
@@ -58,7 +58,10 @@ class AudioEffects : public SoundGenerator<effect_t> {
             LOGD(LOG_METHOD);
             generator_obj = in;
             // automatically activate this object
-            begin();
+            AudioBaseInfo info;
+            info.channels = 1;
+            info.bits_per_sample = sizeof(effect_t)*8;
+            begin(info);
         }
 
         /// Adds an effect object (by reference)

src/AudioEffects/AudioEffectsSuite.h

@@ -616,7 +616,7 @@ class FilterEffectBase : public EffectSuiteBase  {
     return outSample;
   }
 
-  virtual effectsuite_t processDouble(effectsuite_t inputSample)  {
+  virtual effectsuite_t processDouble(effectsuite_t inputSample) override {
     return applyFilter(inputSample);
   }
 
@@ -1162,7 +1162,7 @@ class FilteredDelay : public DelayEffectBase, public FilterEffectBase {
     return out;
   }
 
-  FilteredDelay *clone(){
+  FilteredDelay *clone() override {
     return new FilteredDelay(*this);
   }
 
@@ -1295,7 +1295,7 @@ class SimpleDelay : public DelayEffectBase, public EffectSuiteBase {
     delayTransitionTimeInSamples = seconds * sampleRate;
   }
 
-  SimpleDelay* clone(){
+  SimpleDelay* clone() override {
     return new SimpleDelay(*this);
   }
 
@@ -1434,7 +1434,7 @@ class SimpleFlanger : public DelayEffectBase, public EffectSuiteBase {
     setEffectParams(.707, extSampleRate * .02, .1);
   }
 
-  SimpleFlanger* clone(){
+  SimpleFlanger* clone() override {
     return new SimpleFlanger(*this);
   }
 

src/AudioEffects/SoundGenerator.h

@@ -35,7 +35,7 @@ class SoundGenerator  {
             LOGD(LOG_METHOD);
             active = true;
             activeWarningIssued = false;
-            info.bits_per_sample = sizeof(T)*8;
+            //info.bits_per_sample = sizeof(T)*8;
         }
 
         /// ends the processing
@@ -75,6 +75,10 @@ class SoundGenerator  {
             //LOGD("readBytes: %d", (int)lengthBytes);
             size_t result = 0;
             int ch = audioInfo().channels;
+            if (ch==0){
+                LOGE("Undefine number of channels: %d",ch);
+                ch = 1;
+            }
             int frame_size = sizeof(T) * ch;
             if (active){
                 int len = lengthBytes / frame_size;

src/AudioHttp/ICYStream.h

@@ -136,7 +136,7 @@ class ICYStreamDefault : public AbstractURLStream {
         }
 
         /// not implemented
-        virtual size_t write(const uint8_t *buffer, size_t size) {
+        virtual size_t write(const uint8_t *buffer, size_t size) override {
             LOGE("N/A");
             return 0;
          }

src/AudioHttp/URLStream.h

@@ -5,6 +5,10 @@
 
 #ifdef ESP8266
 #include <ESP8266WiFi.h>
+#elif defined(IS_DESKTOP)
+#include <Client.h>
+#include <WiFiClient.h>
+typedef WiFiClient WiFiClientSecure;
 #else 
 #include <Client.h>
 #include <WiFiClientSecure.h>
@@ -188,8 +192,12 @@ class URLStreamDefault : public AbstractURLStream {
             if (client!=nullptr) return *client;
             if (isSecure){
                 if (clientSecure==nullptr){
+#ifndef IS_DESKTOP
                     clientSecure = new WiFiClientSecure();
                     clientSecure->setInsecure();
+#else
+                    clientSecure = new WiFiClient();
+#endif
                 } 
                 LOGI("WiFiClientSecure");
                 return *clientSecure;
@@ -214,6 +222,7 @@ class URLStreamDefault : public AbstractURLStream {
         }
 
         void login(){
+#ifndef IS_DESKTOP
             LOGD("connectWiFi");
             if (WiFi.status() != WL_CONNECTED && network!=nullptr && password != nullptr){
                 WiFi.begin(network, password);
@@ -223,7 +232,8 @@ class URLStreamDefault : public AbstractURLStream {
                 }
                 Serial.println();
             }
-            delay(500);            
+            delay(500);  
+#endif          
         }
 
         /// waits for some data - returns fals if the request has failed