Configuration in ConfigHelix.h

Author: pschatzmann

src/AACDecoderHelix.h

@@ -3,10 +3,6 @@
 #include "CommonHelix.h"
 #include "libhelix-aac/aacdec.h"
 
-#define AAC_MAX_OUTPUT_SIZE 1024 * 4 * 2
-#define AAC_MAX_FRAME_SIZE 2100
-#define AAC_MIN_FRAME_SIZE 1024
-
 namespace libhelix {
 
 typedef void (*AACInfoCallback)(_AACFrameInfo &info, void *ref);

src/CommonHelix.h

@@ -20,10 +20,7 @@
 #include "utils/Buffers.h"
 #include "utils/Vector.h"
 #include "utils/helix_log.h"
-
-#define SYNCH_WORD_LEN 4
-#define HELIX_PCM_CORRECTED
-#define HELIX_CHUNK_SIZE 1024
+#include "ConfigHelix.h"
 
 namespace libhelix {
 

src/ConfigHelix.h

@@ -0,0 +1,56 @@
+#pragma once
+
+// Common
+#ifndef SYNCH_WORD_LEN
+#  define SYNCH_WORD_LEN 4
+#endif 
+
+#ifndef HELIX_CHUNK_SIZE
+#  define HELIX_CHUNK_SIZE 1024
+#endif
+
+// mp3
+#ifndef MP3_MAX_OUTPUT_SIZE
+#  define MP3_MAX_OUTPUT_SIZE 1024 * 5
+#endif
+#ifndef MP3_MAX_FRAME_SIZE
+#  define MP3_MAX_FRAME_SIZE 1024 * 2
+#endif
+#ifndef MP3_MIN_FRAME_SIZE
+#  define MP3_MIN_FRAME_SIZE 1024
+#endif
+
+// aac
+#ifndef AAC_MAX_OUTPUT_SIZE
+#  define AAC_MAX_OUTPUT_SIZE 1024 * 4 * 2
+#endif
+#ifndef AAC_MAX_FRAME_SIZE
+#  define AAC_MAX_FRAME_SIZE 2100
+#endif
+#ifndef AAC_MIN_FRAME_SIZE
+#  define AAC_MIN_FRAME_SIZE 1024
+#endif
+
+// Allocation:
+#define ALLOCATOR libhelix::AllocatorExt
+
+// Logging: Activate/Deactivate logging
+#if ! defined(HELIX_LOGGING_ACTIVE) && defined(ARDUINO)
+#  define HELIX_LOGGING_ACTIVE true
+#endif
+
+#ifndef HELIX_LOG_LEVEL
+#  define HELIX_LOG_LEVEL LogLevelHelix::Warning
+#endif
+
+#ifndef LOG_METHOD
+#  define LOG_METHOD __PRETTY_FUNCTION__
+#endif
+
+#ifndef HELIX_LOGGING_OUT
+#  define HELIX_LOGGING_OUT Serial
+#endif
+
+#ifndef HELIX_LOG_SIZE
+#  define HELIX_LOG_SIZE 256
+#endif

src/MP3DecoderHelix.h

@@ -4,9 +4,6 @@
 #include "libhelix-mp3/mp3common.h"
 #include "libhelix-mp3/mp3dec.h"
 
-#define MP3_MAX_OUTPUT_SIZE 1024 * 5
-#define MP3_MAX_FRAME_SIZE 1024 * 2
-#define MP3_MIN_FRAME_SIZE 1024
 
 namespace libhelix {
 

src/utils/helix_log.h

@@ -1,26 +1,7 @@
 #pragma once
 #include "stdio.h"  // for snprintf
+#include "../ConfigHelix.h"
 
-// User Settings: Activate/Deactivate logging
-#if ! defined(HELIX_LOGGING_ACTIVE) && defined(ARDUINO)
-#  define HELIX_LOGGING_ACTIVE true
-#endif
-
-#ifndef HELIX_LOG_LEVEL
-#  define HELIX_LOG_LEVEL LogLevelHelix::Warning
-#endif
-
-#ifndef LOG_METHOD
-#  define LOG_METHOD __PRETTY_FUNCTION__
-#endif
-
-#ifndef HELIX_LOGGING_OUT
-#  define HELIX_LOGGING_OUT Serial
-#endif
-
-#ifndef HELIX_LOG_SIZE
-#  define HELIX_LOG_SIZE 256
-#endif
 
 #if defined(ARDUINO) && HELIX_LOGGING_ACTIVE 
 #  include  "Arduino.h" // for Serial; include Serial.h does not work

src/utils/helix_memory.cpp

@@ -1,8 +1,9 @@
 #include "Allocator.h"
 #include "helix_log.h"
+#include "ConfigHelix.h"
 
 char log_buffer_helix[HELIX_LOG_SIZE];
-libhelix::AllocatorExt alloc;
+ALLOCATOR alloc;
 
 #ifdef __cplusplus
 extern "C" {