X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.h;h=0c99d536187cfeb61586cd9a28c1d91a62bebe08;hb=e519feaca11005d330e7b8403b948d4ad9cc3ae8;hp=7a34b80fec949eecf69eb06dec2bcab319404f80;hpb=c6c082c4a8016f85ba4207f4b8ccee1d5770e4a4;p=dcpomatic.git

diff --git a/src/wx/timecode.h b/src/wx/timecode.h
index 7a34b80fe..0c99d5361 100644
--- a/src/wx/timecode.h
+++ b/src/wx/timecode.h
@@ -1,19 +1,20 @@
 /*
-    Copyright (C) 2013-2014 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,25 +23,28 @@
 
 #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;
 
+	static wxSize size (wxWindow* parent);
+
 protected:
 	void changed ();
 	void set_clicked ();
-	
+
 	wxSizer* _sizer;
 	wxPanel* _editable;
 	wxTextCtrl* _hours;
@@ -55,42 +59,66 @@ template <class T>
 class Timecode : public TimecodeBase
 {
 public:
-	Timecode (wxWindow* parent)
-		: TimecodeBase (parent)
+	Timecode (wxWindow* parent, bool set_button = true)
+		: TimecodeBase (parent, set_button)
 	{
 
 	}
 
-	void set (T t, int fps)
+	void set (T t, float fps)
+	{
+		int h;
+		int m;
+		int s;
+		int f;
+		t.split (fps, h, m, s, 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));
+	}
+
+	void set_hint (T t, float fps)
 	{
 		int h;
 		int m;
 		int s;
 		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));
-		
-		_fixed->SetLabel (std_to_wx (t.timecode (fps)));
+
+		_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)));
 	}
 
-	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);
-		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);
-		
+		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_seconds (dcp::raw_convert<double>(f.empty() ? "0" : f) / fps);
+
 		return t;
 	}
+
+private:
+	std::string value_or_hint (wxTextCtrl const * t) const
+	{
+		if (!t->GetValue().IsEmpty()) {
+			return wx_to_std (t->GetValue());
+		} else {
+			return wx_to_std (t->GetHint());
+		}
+	}
 };
 
 #endif