X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;f=cinelerra-5.1%2Fguicast%2Fbctimer.C;h=c1c65dfde2bdfe30738f836d7a39403f362406d3;hb=ccd23c15fae578be22d48b1a1e8b09cb43d593ae;hp=7ccf0249a3135ad8768cd8b0e77a70b7c9fb17d4;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/guicast/bctimer.C b/cinelerra-5.1/guicast/bctimer.C index 7ccf0249..c1c65dfd 100644 --- a/cinelerra-5.1/guicast/bctimer.C +++ b/cinelerra-5.1/guicast/bctimer.C @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #include "bctimer.h" @@ -51,15 +51,15 @@ void Timer::subtract(int64_t value) int64_t Timer::get_difference(struct timeval *result) { gettimeofday(&new_time, 0); - + result->tv_usec = new_time.tv_usec - current_time.tv_usec; result->tv_sec = new_time.tv_sec - current_time.tv_sec; - if(result->tv_usec < 0) + if(result->tv_usec < 0) { - result->tv_usec += 1000000; - result->tv_sec--; + result->tv_usec += 1000000; + result->tv_sec--; } - + return (int64_t)result->tv_sec * 1000 + (int64_t)result->tv_usec / 1000; } @@ -75,14 +75,14 @@ int64_t Timer::get_difference() new_time.tv_sec--; } - return (int64_t)new_time.tv_sec * 1000 + + return (int64_t)new_time.tv_sec * 1000 + (int64_t)new_time.tv_usec / 1000; } int64_t Timer::get_scaled_difference(long denominator) { get_difference(&new_time); - return (int64_t)new_time.tv_sec * denominator + + return (int64_t)new_time.tv_sec * denominator + (int64_t)((double)new_time.tv_usec / 1000000 * denominator); }