comparison src/vamp-sdk/RealTime.cpp @ 419:55de53d7c777

Merge

 }
 
 RealTime
 RealTime::fromSeconds(double sec)
 {
-    return RealTime(int(sec), int((sec - int(sec)) * ONE_BILLION + 0.5));
+    if (sec != sec) { // NaN
+        cerr << "ERROR: NaN/Inf passed to Vamp::RealTime::fromSeconds" << endl;
+        return RealTime::zeroTime;
+    } else if (sec >= 0) {
+        return RealTime(int(sec), int((sec - int(sec)) * ONE_BILLION + 0.5));
+    } else {
+        return -fromSeconds(-sec);
+    }
 }
 
 RealTime
 RealTime::fromMilliseconds(int msec)
 {

 RealTime::toString() const
 {
     std::stringstream out;
     out << *this;
     
-#if (__GNUC__ < 3)
-    out << std::ends;
-#endif
-
     std::string s = out.str();
 
     // remove trailing R
     return s.substr(0, s.length() - 1);
 }

     if (*this < RealTime::zeroTime) return "-" + (-*this).toText();
 
     std::stringstream out;
 
     if (sec >= 3600) {
-	out << (sec / 3600) << ":";
-    }
-
+        out << (sec / 3600) << ":";
+    }
+    
     if (sec >= 60) {
-	out << (sec % 3600) / 60 << ":";
-    }
-
+        int minutes = (sec % 3600) / 60;
+        if (sec >= 3600 && minutes < 10) out << "0";
+        out << minutes << ":";
+    }
+    
     if (sec >= 10) {
-	out << ((sec % 60) / 10);
-    }
-
+        out << ((sec % 60) / 10);
+    }
+    
     out << (sec % 10);
     
     int ms = msec();
 
     if (ms != 0) {

 	}
     } else if (fixedDp) {
 	out << ".000";
     }
 	
-#if (__GNUC__ < 3)
-    out << std::ends;
-#endif
-
     std::string s = out.str();
 
     return s;
 }
-
 
 RealTime
 RealTime::operator/(int d) const
 {
     int secdiv = sec / d;