X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=bf658ba83172b2e6e4b53973be7976d689d09c96;hp=45a421c4d71774d5ad76eb161f8a842e57a6efb5;hb=fc18b92ca1cc8d7ec975fddc507fb97aacc6d17f;hpb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 45a421c4d..bf658ba83 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2020 Carl Hetherington <cth@carlh.net>
 
-    This program is free software; you can redistribute it and/or modify
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
 
-    This program is distributed in the hope that it will be useful,
+    DCP-o-matic is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
 
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
-    Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
 
 */
 
@@ -22,18 +23,19 @@
 
 #include "wx_util.h"
 #include "lib/types.h"
+#include <dcp/raw_convert.h>
 #include <wx/wx.h>
 #include <boost/signals2.hpp>
-#include <boost/lexical_cast.hpp>
 
 class TimecodeBase : public wxPanel
 {
 public:
-	TimecodeBase (wxWindow *);
+	TimecodeBase (wxWindow *, bool set_button);
 
 	void clear ();
 
 	void set_editable (bool);
+	void set_focus ();
 
 	boost::signals2::signal<void ()> Changed;
 
@@ -57,8 +59,8 @@ template <class T>
 class Timecode : public TimecodeBase
 {
 public:
-	Timecode (wxWindow* parent)
-		: TimecodeBase (parent)
+	Timecode (wxWindow* parent, bool set_button = true)
+		: TimecodeBase (parent, set_button)
 	{
 
 	}
@@ -71,25 +73,25 @@ public:
 		int f;
 		t.split (fps, h, m, s, f);
 
-		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>(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 (_fixed, t.timecode (fps));
 	}
 
-	T get (int fps) const
+	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);
+		t += T::from_seconds (dcp::raw_convert<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);
+		t += T::from_seconds (dcp::raw_convert<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));
+		t += T::from_seconds (dcp::raw_convert<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);
+		t += T::from_seconds (dcp::raw_convert<double>(f.empty() ? "0" : f) / fps);
 
 		return t;
 	}