X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=529cc2943b4f03bbbae694dcdf993ed834ee553e;hb=b9a1ad3df5f9d85fb7439efd93fede72b9b078af;hp=31ddd111caec3aa17538122100dad3b42713389a;hpb=fab7fa5a9ef1d069c7ca32e3669d0e37e896250c;p=dcpomatic.git

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 31ddd111c..529cc2943 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,14 +18,21 @@
 
 */
 
+
 #ifndef DCPOMATIC_WX_TIMECODE_H
 #define DCPOMATIC_WX_TIMECODE_H
 
+
 #include "wx_util.h"
+#include "lib/dcpomatic_time.h"
 #include "lib/types.h"
+#include "lib/warnings.h"
+#include <dcp/raw_convert.h>
+DCPOMATIC_DISABLE_WARNINGS
 #include <wx/wx.h>
+DCPOMATIC_ENABLE_WARNINGS
 #include <boost/signals2.hpp>
-#include <boost/lexical_cast.hpp>
+
 
 class TimecodeBase : public wxPanel
 {
@@ -53,8 +60,11 @@ protected:
 	wxTextCtrl* _frames;
 	wxButton* _set_button;
 	wxStaticText* _fixed;
+
+	bool _ignore_changed = false;
 };
 
+
 template <class T>
 class Timecode : public TimecodeBase
 {
@@ -67,33 +77,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, boost::lexical_cast<std::string> (h));
-		checked_set (_minutes, boost::lexical_cast<std::string> (m));
-		checked_set (_seconds, boost::lexical_cast<std::string> (s));
-		checked_set (_frames, boost::lexical_cast<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));
 	}
 
-	T get (int fps) const
+	void set_hint (T t, float fps)
+	{
+		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)));
+	}
+
+	dcpomatic::HMSF get () const
+	{
+		auto value_or_hint = [](wxTextCtrl const * t) {
+			auto s = wx_to_std (t->GetValue().IsEmpty() ? t->GetHint() : t->GetValue());
+			if (s.empty()) {
+				return 0;
+			}
+			return dcp::raw_convert<int>(s);
+		};
+
+		return { value_or_hint(_hours),
+			value_or_hint(_minutes),
+			value_or_hint(_seconds),
+			value_or_hint(_frames) };
+	}
+
+	T get (float fps) const
 	{
-		T t;
-		std::string const h = wx_to_std (_hours->GetValue ());
-		t += T::from_seconds (boost::lexical_cast<int> (h.empty() ? "0" : h) * 3600);
-		std::string const m = wx_to_std (_minutes->GetValue());
-		t += T::from_seconds (boost::lexical_cast<int> (m.empty() ? "0" : m) * 60);
-		std::string const s = wx_to_std (_seconds->GetValue());
-		t += T::from_seconds (boost::lexical_cast<int> (s.empty() ? "0" : s));
-		std::string const f = wx_to_std (_frames->GetValue());
-		t += T::from_seconds (boost::lexical_cast<double> (f.empty() ? "0" : f) / fps);
-
-		return t;
+		return T(get(), fps);
 	}
 };