From e8e7350db3bbf1d408ca4b305329c17d545c91eb Mon Sep 17 00:00:00 2001
From: Jörgen Scott <jorgen.scott@gmail.com>
Date: Mon, 9 Feb 2015 10:17:01 +0100
Subject: Bug fix for static delay

---
 src/OutputUHD.cpp | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'src')

diff --git a/src/OutputUHD.cpp b/src/OutputUHD.cpp
index 91c030f..3845439 100644
--- a/src/OutputUHD.cpp
+++ b/src/OutputUHD.cpp
@@ -341,7 +341,7 @@ int OutputUHD::process(Buffer* dataIn, Buffer* dataOut)
             myEtiReader->sourceContainsTimestamp();
 
         // calculate delay
-        uint32_t noSampleDelay = (myStaticDelayUs * myConf.sampleRate / 1000) / 1000;
+        uint32_t noSampleDelay = (myStaticDelayUs * (myConf.sampleRate / 1000)) / 1000;
         uint32_t noByteDelay = noSampleDelay * sizeof(complexf);
 
         uint8_t* pInData = (uint8_t*) dataIn->getData();
@@ -690,10 +690,10 @@ void OutputUHD::set_parameter(const string& parameter, const string& value)
         int adjust;
         ss >> adjust;
         int newStaticDelayUs = myStaticDelayUs + adjust;
-        if (newStaticDelayUs > myTFDurationMs * 1000)
-            myStaticDelayUs = newStaticDelayUs - myTFDurationMs * 1000;
+        if (newStaticDelayUs > (myTFDurationMs * 1000))
+            myStaticDelayUs = newStaticDelayUs - (myTFDurationMs * 1000);
         else if (newStaticDelayUs < 0)
-            myStaticDelayUs = newStaticDelayUs + myTFDurationMs * 1000;
+            myStaticDelayUs = newStaticDelayUs + (myTFDurationMs * 1000);
         else
             myStaticDelayUs = newStaticDelayUs;
     }
-- 
cgit v1.2.3