refresh frame fix, dblclk proxy viewer fix, vicon refresh fix for awdw resize, fix...

[goodguy/history.git] / cinelerra-5.1 / guicast / condition.C

diff --git a/cinelerra-5.1/guicast/condition.C b/cinelerra-5.1/guicast/condition.C
index 15bc0239ec3a77c93524ac414b0745d529067519..e57110cab9bb76a15299c195bceef055dca32d3e 100644 (file)
--- a/cinelerra-5.1/guicast/condition.C
+++ b/cinelerra-5.1/guicast/condition.C
@@ -2,21 +2,21 @@
 /*
  * CINELERRA
  * Copyright (C) 2008 Adam Williams <broadcast at earthling dot net>
- * 
+ *
  * 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 "bcsignals.h"
@@ -92,11 +92,11 @@ int Condition::timed_lock(int microseconds, const char *location)
        struct timeval now;
        gettimeofday(&now, 0);
 #if 1
-       struct timespec timeout;
-       timeout.tv_sec = now.tv_sec + microseconds / 1000000;
-       timeout.tv_nsec = now.tv_usec * 1000 + (microseconds % 1000000) * 1000;
-       while(value <= 0 && result != ETIMEDOUT)
-       {
+       int64_t nsec = now.tv_usec * 1000 + (microseconds % 1000000) * 1000;
+       int64_t sec = nsec / 1000000000;  nsec %= 1000000000;
+       sec += now.tv_sec + microseconds / 1000000;
+       struct timespec timeout;  timeout.tv_sec = sec;   timeout.tv_nsec = nsec;
+       while( value <= 0 && result != ETIMEDOUT ) {
                result = pthread_cond_timedwait(&cond, &mutex, &timeout);
        }