namespace

Author: pschatzmann

src/SnapClient.h

@@ -22,6 +22,8 @@
 #include "api/SnapOutput.h"
 #include "api/SnapProcessor.h"
 
+namespace snap_arduino {
+
 /**
  * @brief Snap Client for ESP32 Arduino
  * @author Phil Schatzmann
@@ -229,3 +231,5 @@ class SnapClient {
 #endif
   }
 };
+
+}

src/SnapConfig.h

@@ -66,4 +66,9 @@
 
 #ifndef RTOS_TASK_PRIORITY
 #   define RTOS_TASK_PRIORITY 2
+#endif
+
+#ifndef SNAP_NO_NAMESPACE
+namespace snap_arduino {}
+using namespace snap_arduino;
 #endif

src/api/SnapCommon.h

@@ -7,6 +7,8 @@
 #include <iomanip>
 #include <ctime>
 
+namespace snap_arduino {
+
 enum codec_type { NO_CODEC, PCM, FLAC, OGG, OPUS };
 static const char *TAG="COMMON";
 /**
@@ -51,3 +53,4 @@ inline void logHeap() {
 #endif
 }
 
+}

src/api/SnapOutput.h

@@ -11,8 +11,9 @@
 #include "SnapTime.h"
 #include "SnapTimeSync.h"
 
+namespace snap_arduino {
+
 class SnapProcessor;
-class SnapProcessorRTOS;
 
 /**
  * @brief Simple Output Class which uses the AudioTools to build an output chain
@@ -24,8 +25,6 @@ class SnapProcessorRTOS;
  **/
 
 class SnapOutput : public AudioInfoSupport {
-  friend SnapProcessor;
-  friend SnapProcessorRTOS;
 
  public:
   SnapOutput() = default;
@@ -121,6 +120,43 @@ class SnapOutput : public AudioInfoSupport {
 
   bool isStarted() { return is_audio_begin_called; }
 
+  // writes the audio data to the decoder
+  size_t audioWrite(const void *src, size_t size) {
+    ESP_LOGD(TAG, "%zu", size);
+    size_t result = decoder_stream.write((const uint8_t *)src, size);
+
+    return result;
+  }
+
+  /// start to play audio only in valid server time: return false if to be
+  /// ignored - update playback speed
+  bool synchronizePlayback() {
+    bool result = true;
+    SnapTimeSync &ts = *p_snap_time_sync;
+
+    // calculate how long we need to wait to playback the audio
+    auto delay_ms = getDelayMs();
+
+    if (!is_sync_started) {
+      ts.begin(audio_info.sample_rate);
+
+      // start audio when first package in the future becomes valid
+      result = synchronizeOnStart(delay_ms);
+    } else {
+      // provide the actual delay to the synch
+      ts.updateActualDelay(delay_ms);
+
+      if (ts.isSync()) {
+        // update speed
+        float current_factor = playbackFactor();
+        float new_factor = p_snap_time_sync->getFactor();
+        if (new_factor != current_factor) {
+          setPlaybackFactor(new_factor);
+        }
+      }
+    }
+    return result;
+  }
 
  protected:
   const char *TAG = "SnapOutput";
@@ -192,43 +228,6 @@ class SnapOutput : public AudioInfoSupport {
     out->end();
   }
 
-  // writes the audio data to the decoder
-  size_t audioWrite(const void *src, size_t size) {
-    ESP_LOGD(TAG, "%zu", size);
-    size_t result = decoder_stream.write((const uint8_t *)src, size);
-
-    return result;
-  }
-
-  /// start to play audio only in valid server time: return false if to be
-  /// ignored - update playback speed
-  bool synchronizePlayback() {
-    bool result = true;
-    SnapTimeSync &ts = *p_snap_time_sync;
-
-    // calculate how long we need to wait to playback the audio
-    auto delay_ms = getDelayMs();
-
-    if (!is_sync_started) {
-      ts.begin(audio_info.sample_rate);
-
-      // start audio when first package in the future becomes valid
-      result = synchronizeOnStart(delay_ms);
-    } else {
-      // provide the actual delay to the synch
-      ts.updateActualDelay(delay_ms);
-
-      if (ts.isSync()) {
-        // update speed
-        float current_factor = playbackFactor();
-        float new_factor = p_snap_time_sync->getFactor();
-        if (new_factor != current_factor) {
-          setPlaybackFactor(new_factor);
-        }
-      }
-    }
-    return result;
-  }
 
   bool synchronizeOnStart(int delay_ms) {
     bool result = true;
@@ -258,4 +257,6 @@ class SnapOutput : public AudioInfoSupport {
     int delay_ms = diff_ms + p_snap_time_sync->getStartDelay();
     return delay_ms;
   }
-};
+};
+
+}

src/api/SnapProcessor.h

@@ -9,6 +9,8 @@
 #include "SnapTime.h"
 #include "vector"
 
+namespace snap_arduino {
+
 /**
  * @brief Snap Processor implementation which does not rely on FreeRTOS
  * @author Phil Schatzmann
@@ -547,3 +549,5 @@ class SnapProcessor {
     return p_snap_output->writeHeader(header);
   }
 };
+
+}

src/api/SnapProcessorRTOS.h

@@ -2,6 +2,8 @@
 #include "SnapOutput.h"
 #include "freertos-all.h"  // https://github.com/pschatzmann/arduino-freertos-addons
 
+namespace snap_arduino {
+
 /**
  * @brief Processor for which the encoded output is buffered in a queue in order to
  * prevent any buffer underruns. A RTOS task feeds the output from the queue.
@@ -123,4 +125,6 @@ class SnapProcessorRTOS : public SnapProcessor {
   }
 };
 
-SnapProcessorRTOS *SnapProcessorRTOS::self = nullptr;
+SnapProcessorRTOS *SnapProcessorRTOS::self = nullptr;
+
+}

src/api/SnapProtocol.h

@@ -18,6 +18,8 @@
 #define TIME_MESSAGE_SIZE 8
 #define MAX_JSON_LEN 256
 
+namespace snap_arduino {
+
 /// @brief Buffer to read different data types
 struct SnapReadBuffer {
   const char *buffer;
@@ -457,3 +459,5 @@ struct SnapMessageTime {
     return result;
   }
 };
+
+}

src/api/SnapTime.h

@@ -4,6 +4,8 @@
 #include <stdint.h>
 #include <sys/time.h>
 
+namespace snap_arduino {
+
 /**
  * @brief The the sys/time functions are used to represent the server time.
  * The local time will be measured with the help of the Arduino millis() method.
@@ -118,3 +120,5 @@ class SnapTime {
   bool has_sntp_time = false;
 
 };
+
+}

src/api/SnapTimeSync.h

@@ -3,6 +3,8 @@
 #include "SnapLogger.h"
 #include "SnapTime.h"
 
+namespace snap_arduino {
+
 /**
  * @brief Abstract (Common) Time Synchronization Logic which consists of the
  * startup synchronization and the local to server clock synchronization which
@@ -184,3 +186,4 @@ class SnapTimeSyncFixed : public SnapTimeSync {
   float resample_factor;
 };
 
+}