X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fsubrip.cc;h=3eac98e638d22c17a1940a2355abee33a3fe1649;hb=a79d78d8bb6d51f6662f1f63b9f8fd19e1a0c5f1;hp=380a2ce2cb7e7757c2e1fc7472f571d72aa0a693;hpb=58588c485eac7c488a574fe923576f109ec0134e;p=dcpomatic.git

diff --git a/src/lib/subrip.cc b/src/lib/subrip.cc
index 380a2ce2c..3eac98e63 100644
--- a/src/lib/subrip.cc
+++ b/src/lib/subrip.cc
@@ -126,18 +126,18 @@ SubRip::SubRip (shared_ptr<const SubRipContent> content)
 ContentTime
 SubRip::convert_time (string t)
 {
-	ContentTime r = 0;
+	ContentTime r;
 
 	vector<string> a;
 	boost::algorithm::split (a, t, boost::is_any_of (":"));
 	assert (a.size() == 3);
-	r += lexical_cast<int> (a[0]) * 60 * 60 * TIME_HZ;
-	r += lexical_cast<int> (a[1]) * 60 * TIME_HZ;
+	r += ContentTime::from_seconds (lexical_cast<int> (a[0]) * 60 * 60);
+	r += ContentTime::from_seconds (lexical_cast<int> (a[1]) * 60);
 
 	vector<string> b;
 	boost::algorithm::split (b, a[2], boost::is_any_of (","));
-	r += lexical_cast<int> (b[0]) * TIME_HZ;
-	r += lexical_cast<int> (b[1]) * TIME_HZ / 1000;
+	r += ContentTime::from_seconds (lexical_cast<int> (b[0]));
+	r += ContentTime::from_seconds (lexical_cast<float> (b[1]) / 1000);
 
 	return r;
 }
@@ -229,7 +229,7 @@ ContentTime
 SubRip::length () const
 {
 	if (_subtitles.empty ()) {
-		return 0;
+		return ContentTime ();
 	}
 
 	return _subtitles.back().to;