X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Fwx%2Ftimecode.cc;h=07cb0be6586b6485defff73b314ad2702fac87f5;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=166446d8c76140eb1e5fa01c27731abdb003111a;hpb=491daf8790f35611052d8954d5d74df275dcda18;p=dcpomatic.git

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 166446d8c..07cb0be65 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -83,40 +83,34 @@ Timecode::Timecode (wxWindow* parent)
 }
 
 void
-Timecode::set (Time t, int fps)
+Timecode::set (DCPTime t, int fps)
 {
-	/* 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;
+	int h;
+	int m;
+	int s;
+	int f;
+	t.split (fps, h, m, s, f);
 
 	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.%02" wxLongLongFmtSpec "d", h, m, s, f));
+	_fixed->SetLabel (std_to_wx (t.timecode (fps)));
 }
 
-Time
+DCPTime
 Timecode::get (int fps) const
 {
-	Time t = 0;
+	DCPTime t;
 	string const h = wx_to_std (_hours->GetValue ());
-	t += lexical_cast<int> (h.empty() ? "0" : h) * 3600 * TIME_HZ;
+	t += DCPTime::from_seconds (lexical_cast<int> (h.empty() ? "0" : h) * 3600);
 	string const m = wx_to_std (_minutes->GetValue());
-	t += lexical_cast<int> (m.empty() ? "0" : m) * 60 * TIME_HZ;
+	t += DCPTime::from_seconds (lexical_cast<int> (m.empty() ? "0" : m) * 60);
 	string const s = wx_to_std (_seconds->GetValue());
-	t += lexical_cast<int> (s.empty() ? "0" : s) * TIME_HZ;
+	t += DCPTime::from_seconds (lexical_cast<int> (s.empty() ? "0" : s));
 	string const f = wx_to_std (_frames->GetValue());
-	t += lexical_cast<int> (f.empty() ? "0" : f) * TIME_HZ / fps;
+	t += DCPTime::from_seconds (lexical_cast<double> (f.empty() ? "0" : f) / fps);
 
 	return t;
 }