X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=ccab0ecfcb1686229b8da208163bc25fa240b2d9;hb=1905ef29b005f501c91c0537b6a6e723bf87d1ac;hp=3746b32cd621a3fa4710b27bad1a76cd7db20899;hpb=62bfae1511bb8d33ef4cd71b5822bb0b74a5389c;p=dcpomatic.git

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 3746b32cd..ccab0ecfc 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,6 +22,7 @@
 #define DCPOMATIC_WX_TIMECODE_H
 
 #include "wx_util.h"
+#include "lib/dcpomatic_time.h"
 #include "lib/types.h"
 #include <dcp/raw_convert.h>
 #include <wx/wx.h>
@@ -67,56 +68,45 @@ public:
 
 	void set (T t, float fps)
 	{
-		int h;
-		int m;
-		int s;
-		int f;
-		t.split (fps, h, m, s, f);
+		auto const hmsf = t.split (fps);
 
-		checked_set (_hours, dcp::raw_convert<std::string>(h));
-		checked_set (_minutes, dcp::raw_convert<std::string>(m));
-		checked_set (_seconds, dcp::raw_convert<std::string>(s));
-		checked_set (_frames, dcp::raw_convert<std::string>(f));
+		checked_set (_hours, dcp::raw_convert<std::string>(hmsf.h));
+		checked_set (_minutes, dcp::raw_convert<std::string>(hmsf.m));
+		checked_set (_seconds, dcp::raw_convert<std::string>(hmsf.s));
+		checked_set (_frames, dcp::raw_convert<std::string>(hmsf.f));
 
 		checked_set (_fixed, t.timecode (fps));
 	}
 
 	void set_hint (T t, float fps)
 	{
-		int h;
-		int m;
-		int s;
-		int f;
-		t.split (fps, h, m, s, f);
-
-		_hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(h)));
-		_minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(m)));
-		_seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(s)));
-		_frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(f)));
+		auto hmsf = t.split (fps);
+
+		_hours->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.h)));
+		_minutes->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.m)));
+		_seconds->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.s)));
+		_frames->SetHint (std_to_wx(dcp::raw_convert<std::string>(hmsf.f)));
 	}
 
-	T get (float fps) const
+	dcpomatic::HMSF get () const
 	{
-		T t;
-
 		auto value_or_hint = [](wxTextCtrl const * t) {
-			if (!t->GetValue().IsEmpty()) {
-				return wx_to_std (t->GetValue());
-			} else {
-				return wx_to_std (t->GetHint());
+			auto s = wx_to_std (t->GetValue().IsEmpty() ? t->GetHint() : t->GetValue());
+			if (s.empty()) {
+				return 0;
 			}
+			return dcp::raw_convert<int>(s);
 		};
 
-		std::string const h = value_or_hint (_hours);
-		t += T::from_seconds (dcp::raw_convert<int>(h.empty() ? "0" : h) * 3600);
-		std::string const m = value_or_hint (_minutes);
-		t += T::from_seconds (dcp::raw_convert<int>(m.empty() ? "0" : m) * 60);
-		std::string const s = value_or_hint (_seconds);
-		t += T::from_seconds (dcp::raw_convert<int>(s.empty() ? "0" : s));
-		std::string const f = value_or_hint (_frames);
-		t += T::from_frames (dcp::raw_convert<int>(f.empty() ? "0" : f), fps);
+		return { value_or_hint(_hours),
+			value_or_hint(_minutes),
+			value_or_hint(_seconds),
+			value_or_hint(_frames) };
+	}
 
-		return t;
+	T get (float fps) const
+	{
+		return T(get(), fps);
 	}
 };