Compile warnings

Author: pschatzmann

src/AACDecoderHelix.h

@@ -20,17 +20,26 @@ typedef void (*AACDataCallback)(_AACFrameInfo &info,short *pwm_buffer, size_t le
 class AACDecoderHelix : public CommonHelix {
     public:
         AACDecoderHelix() {
-        }
+             decoder = AACInitDecoder();
+       }
 
 #ifdef ARDUINO
         AACDecoderHelix(Print &output, AACInfoCallback infoCallback=nullptr){
+            decoder = AACInitDecoder();
             this->out = &output;
             this->infoCallback = infoCallback;
         }
 #endif
         AACDecoderHelix(AACDataCallback dataCallback){
+            decoder = AACInitDecoder();
             this->pwmCallback = dataCallback;
         }
+
+        ~MP3DecoderHelix(){
+            MP3FreeDecoder(decoder);
+        }
+
+
         void setInfoCallback(AACInfoCallback cb){
             this->infoCallback = cb;
         }
@@ -39,22 +48,13 @@ class AACDecoderHelix : public CommonHelix {
             this->pwmCallback = cb;
         }
 
-         /// Starts the processing
-        void begin(){
-            LOG(Debug, "begin");
-            CommonHelix::begin();
-            decoder = AACInitDecoder();
-            if (decoder==nullptr){
-                LOG(Error, "MP3InitDecoder has failed");
-                active = false;
-                return;
-            }
-        }
 
         /// Releases the reserved memory
         void end(){
             LOG(Debug, "end");
-            AACFreeDecoder(decoder);
+            if (CommonHelix::active){
+                AACFreeDecoder(decoder);
+            }
             CommonHelix::end();
         }
 

src/CommonHelix.h

@@ -9,11 +9,13 @@
 #endif
 
 // Not all processors support assert
-#ifdef NDEBUG
+#ifndef assert
+#ifdef NDEBUG 
 #  define assert(condition) ((void)0)
 #else
 #  define assert(condition) /*implementation defined*/
 #endif
+#endif
 
 #include "helix_log.h"
 
@@ -42,7 +44,7 @@ struct Range {
 class CommonHelix   {
     public:
 
-        ~CommonHelix(){
+        virtual ~CommonHelix(){
             if (active){
                 end();
             }
@@ -116,6 +118,8 @@ class CommonHelix   {
                     write_len = min(in_size - start, static_cast<size_t>(maxFrameSize()-buffer_size));
                     yield();
                 }
+            } else {
+                LOG(Warn, "CommonHelix not active");
             }
 
             return start;
@@ -168,6 +172,9 @@ class CommonHelix   {
             int process_size = min((int)(maxFrameSize() - buffer_size), in_size);
             memmove(frame_buffer+buffer_size, in_ptr, process_size); 
             buffer_size += process_size;
+            if (buffer_size>maxFrameSize()){
+                LOG(Error "Increase MAX_FRAME_SIZE > %ld", buffer_size);
+            }
             assert(buffer_size<=maxFrameSize());
 
             LOG(Debug, "appendToBuffer %d + %d  -> %u", buffer_size_old,  process_size, buffer_size );

src/MP3DecoderHelix.h

@@ -5,7 +5,8 @@
 #include "libhelix-mp3/mp3common.h"
 
 #define MP3_MAX_OUTPUT_SIZE 1024 * 2
-#define MP3_MAX_FRAME_SIZE 1600 
+//#define MP3_MAX_FRAME_SIZE 1600 
+#define MP3_MAX_FRAME_SIZE 10000 
 
 namespace libhelix {
 
@@ -26,25 +27,34 @@ class MP3DecoderHelix : public CommonHelix {
 
     public:
         MP3DecoderHelix(){
+            decoder = MP3InitDecoder();
             this->mp3_type = MP3Normal;
         }
 
 #ifdef ARDUINO
         MP3DecoderHelix(Print &output, MP3Type mp3Type=MP3Normal, MP3InfoCallback infoCallback=nullptr){
+            decoder = MP3InitDecoder();
             this->out = &output;
             this->infoCallback = infoCallback;
             this->mp3_type = mp3Type;
         }
 #endif
         MP3DecoderHelix(MP3DataCallback dataCallback, MP3Type mp3Type=MP3Normal){
+            decoder = MP3InitDecoder();
             this->pwmCallback = dataCallback;
             this->mp3_type = mp3Type;
         }
 
         MP3DecoderHelix(MP3Type mp3Type){
+            decoder = MP3InitDecoder();
             this->mp3_type = mp3Type;
         }
 
+        ~MP3DecoderHelix(){
+            MP3FreeDecoder(decoder);
+        }
+
+
         void setInfoCallback(MP3InfoCallback cb){
             this->infoCallback = cb;
         }
@@ -53,25 +63,6 @@ class MP3DecoderHelix : public CommonHelix {
             this->pwmCallback = cb;
         }
 
-         /// Starts the processing
-        void begin(){
-            LOG(Debug, "begin");
-            CommonHelix::begin();
-            decoder = MP3InitDecoder();
-            if (decoder==nullptr){
-                LOG(Error, "MP3InitDecoder has failed");
-                active = false;
-                return;
-            }
-        }
-
-        /// Releases the reserved memory
-        void end(){
-            LOG(Debug, "end");
-            MP3FreeDecoder(decoder);
-            CommonHelix::end();
-        }
-
         /// Provides the last available MP3FrameInfo
         MP3FrameInfo audioInfo(){
             return mp3FrameInfo;

src/helix_log.h

@@ -2,10 +2,10 @@
 
 // User Settings: Activate/Deactivate logging
 #ifndef HELIX_LOGGING_ACTIVE
-#define HELIX_LOGGING_ACTIVE false
+#define HELIX_LOGGING_ACTIVE true
 #endif
 #ifndef HELIX_LOG_LEVEL
-#define HELIX_LOG_LEVEL Warning
+#define HELIX_LOG_LEVEL Debug
 #endif
 
 // Logging Implementation