aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJosh Blum <josh@joshknows.com>2013-08-06 18:11:54 -0700
committerJosh Blum <josh@joshknows.com>2013-08-06 18:11:54 -0700
commit1c391767dd2ae3e1d6f2f543b0d685d8fe058388 (patch)
tree56348d8859251ce2a64f8c97d7e5c26d7c8bf0a3
parentaa5e5d23c86fe0fe77629bf8720dc6844f770407 (diff)
parent8a77ed3a208aed4adabb1e1d7e2bff6d25c75db9 (diff)
downloaduhd-1c391767dd2ae3e1d6f2f543b0d685d8fe058388.tar.gz
uhd-1c391767dd2ae3e1d6f2f543b0d685d8fe058388.tar.bz2
uhd-1c391767dd2ae3e1d6f2f543b0d685d8fe058388.zip
Merge branch 'maint'
-rw-r--r--host/lib/types/time_spec.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/host/lib/types/time_spec.cpp b/host/lib/types/time_spec.cpp
index 2a5102190..4fe090095 100644
--- a/host/lib/types/time_spec.cpp
+++ b/host/lib/types/time_spec.cpp
@@ -121,7 +121,7 @@ long long time_spec_t::to_ticks(double tick_rate) const{
const long long ticks_full = this->get_full_secs()*rate_i;
const double ticks_error = this->get_full_secs()*rate_f;
const double ticks_frac = this->get_frac_secs()*tick_rate;
- return ticks_full + ticks_error + ticks_frac;
+ return ticks_full + fast_llround(ticks_error + ticks_frac);
}
double time_spec_t::get_real_secs(void) const{