From: Carl Hetherington <cth@carlh.net>
Date: Tue, 18 Mar 2014 15:19:13 +0000 (+0000)
Subject: Fix bad rounding of timecodes for display.
X-Git-Tag: v2.0.48~551^2~310
X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=ae27e065d49a5d2476913f677745dd7e4a31cc09;hp=04ef57589ebb7c0de3377172a03b24698fd2364a;p=dcpomatic.git

Fix bad rounding of timecodes for display.

Reported-by: Gérald Maruccia
---

diff --git a/ChangeLog b/ChangeLog
index 45847805a..f4830e40d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2014-03-18  Carl Hetherington  <cth@carlh.net>
 
+	* Fix bad rounding of timecodes.
+
 	* Tentative support for 3D from alternate frames of the source.
 
 2014-03-17  Carl Hetherington  <cth@carlh.net>
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index ac4fd46c4..a8c90b488 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -85,20 +85,24 @@ Timecode::Timecode (wxWindow* parent)
 void
 Timecode::set (Time t, int fps)
 {
-	int const h = t / (3600 * TIME_HZ);
-	t -= h * 3600 * TIME_HZ;
-	int const m = t / (60 * TIME_HZ);
-	t -= m * 60 * TIME_HZ;
-	int const s = t / TIME_HZ;
-	t -= s * TIME_HZ;
-	int const f = divide_with_round (t * fps, TIME_HZ);
+	/* Do this calculation with frames so that we can round
+	   to a frame boundary at the start rather than the end.
+	*/
+	int64_t f = divide_with_round (t * fps, TIME_HZ);
+	
+	int const h = f / (3600 * fps);
+	f -= h * 3600 * fps;
+	int const m = f / (60 * fps);
+	f -= m * 60 * fps;
+	int const s = f / fps;
+	f -= s * fps;
 
 	checked_set (_hours, lexical_cast<string> (h));
 	checked_set (_minutes, lexical_cast<string> (m));
 	checked_set (_seconds, lexical_cast<string> (s));
 	checked_set (_frames, lexical_cast<string> (f));
 
-	_fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02d", h, m, s, f));
+	_fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02ld", h, m, s, f));
 }
 
 Time