From d1711722dd432ba63b54f93d92270d4050465204 Mon Sep 17 00:00:00 2001
From: Josh Blum <josh@joshknows.com>
Date: Fri, 6 Aug 2010 15:02:33 -0700
Subject: uhd: use int to round down for gain group
---
host/lib/utils/gain_group.cpp | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
(limited to 'host/lib/utils')
diff --git a/host/lib/utils/gain_group.cpp b/host/lib/utils/gain_group.cpp
index 5a14fa96f..1be09dee2 100644
--- a/host/lib/utils/gain_group.cpp
+++ b/host/lib/utils/gain_group.cpp
@@ -21,13 +21,10 @@
#include <uhd/utils/assert.hpp>
#include <boost/foreach.hpp>
#include <boost/bind.hpp>
-#include <boost/math/special_functions/round.hpp>
#include <algorithm>
#include <vector>
#include <iostream>
-#define rint(x) boost::math::iround(x)
-
using namespace uhd;
static const bool verbose = false;
@@ -86,7 +83,7 @@ public:
BOOST_FOREACH(const gain_fcns_t &fcns, all_fcns){
const gain_range_t range = fcns.get_range();
gain_bucket.push_back(
- max_step*rint(std::clip(gain_left_to_distribute, range.min, range.max)/max_step)
+ max_step*int(std::clip(gain_left_to_distribute, range.min, range.max)/max_step)
);
gain_left_to_distribute -= gain_bucket.back();
}
@@ -109,7 +106,7 @@ public:
//fill in the largest step sizes first that are less than the remainder
BOOST_FOREACH(size_t i, indexes_step_size_dec){
const gain_range_t range = all_fcns.at(i).get_range();
- float additional_gain = range.step*rint(
+ float additional_gain = range.step*int(
std::clip(gain_bucket.at(i) + gain_left_to_distribute, range.min, range.max
)/range.step) - gain_bucket.at(i);
gain_bucket.at(i) += additional_gain;
--
cgit v1.2.3