Merge raspine/master, with ZMQ Remote-Control code

This adds zmq rc fixes and an example tool to interface to it

1 files changed, 7 insertions, 1 deletions

diff --git a/src/OutputUHD.h b/src/OutputUHD.h
index 7eb6733..c5d561b 100644
--- a/src/OutputUHD.h
+++ b/src/OutputUHD.h
@@ -171,6 +171,7 @@ struct OutputUHDConfig {
     double txgain;
     bool enableSync;
     bool muteNoTimestamps;
+    unsigned dabMode;
 
     /* allowed values : auto, int, sma, mimo */
     std::string refclk_src;
@@ -231,8 +232,13 @@ class OutputUHD: public ModOutput, public RemoteControllable {
         bool myMuting;
 
     private:
+        // Resize the internal delay buffer according to the dabMode and
+        // the sample rate.
+        void SetDelayBuffer(unsigned int dabMode);
+
         // data
-        int myStaticDelay;
+        int myStaticDelayUs; // static delay in microseconds
+        int myTFDurationMs; // TF duration in milliseconds
         std::vector<complexf> myDelayBuf;
         size_t lastLen;
 };