X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=1ab4b590b2b130b4f7d0c80cd21c766c6706ff41;hp=82c27c5b5ad171a63b18297fd3308d374921e4fe;hb=854f2e5bbb7ffb9758b823af87034033033f3cb8;hpb=ba17803f7e33be2bea1363b5a7115e4713dd5997

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 82c27c5b5..1ab4b590b 100644
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -42,79 +42,102 @@ Timecode::Timecode (wxWindow* parent)
 	}
 
 	validator.SetIncludes (list);
+
+	_sizer = new wxBoxSizer (wxHORIZONTAL);
 	
-	wxBoxSizer* sizer = new wxBoxSizer (wxHORIZONTAL);
-	_hours = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	_editable = new wxPanel (this);
+	wxSizer* editable_sizer = new wxBoxSizer (wxHORIZONTAL);
+	_hours = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
 	_hours->SetMaxLength (2);
-	sizer->Add (_hours);
-	add_label_to_sizer (sizer, this, wxT (":"), false);
-	_minutes = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	editable_sizer->Add (_hours);
+	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
+	_minutes = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
 	_minutes->SetMaxLength (2);
-	sizer->Add (_minutes);
-	add_label_to_sizer (sizer, this, wxT (":"), false);
-	_seconds = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	editable_sizer->Add (_minutes);
+	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
+	_seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
 	_seconds->SetMaxLength (2);
-	sizer->Add (_seconds);
-	add_label_to_sizer (sizer, this, wxT ("."), false);
-	_frames = new wxTextCtrl (this, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
+	editable_sizer->Add (_seconds);
+	add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
+	_frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
 	_frames->SetMaxLength (2);
-	sizer->Add (_frames);
-	_set_button = new wxButton (this, wxID_ANY, _("Set"));
-	sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
+	editable_sizer->Add (_frames);
+	_set_button = new wxButton (_editable, wxID_ANY, _("Set"));
+	editable_sizer->Add (_set_button, 0, wxLEFT | wxRIGHT, 8);
+	_editable->SetSizerAndFit (editable_sizer);
+	_sizer->Add (_editable);
 
-	_hours->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
-	_minutes->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
-	_seconds->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
-	_frames->Connect (wxID_ANY, wxEVT_COMMAND_TEXT_UPDATED, wxCommandEventHandler (Timecode::changed), 0, this);
-	_set_button->Connect (wxID_ANY, wxEVT_COMMAND_BUTTON_CLICKED, wxCommandEventHandler (Timecode::set_clicked), 0, this);
+	_fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false);
+	
+	_hours->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
+	_minutes->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
+	_seconds->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
+	_frames->Bind	  (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&Timecode::changed, this));
+	_set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&Timecode::set_clicked, this));
 
 	_set_button->Enable (false);
-	
-	SetSizerAndFit (sizer);
+
+	set_editable (true);
+
+	SetSizerAndFit (_sizer);
 }
 
 void
-Timecode::set (Time t, int fps)
+Timecode::set (DCPTime t, int fps)
 {
-	int const h = t / (3600 * TIME_HZ);
-	t -= h * 3600 * TIME_HZ;
-	int const m = t / (60 * TIME_HZ);
-	t -= m * 60 * TIME_HZ;
-	int const s = t / TIME_HZ;
-	t -= s * TIME_HZ;
-	int const f = t * fps / TIME_HZ;
-
-	_hours->SetValue (wxString::Format (wxT ("%d"), h));
-	_minutes->SetValue (wxString::Format (wxT ("%d"), m));
-	_seconds->SetValue (wxString::Format (wxT ("%d"), s));
-	_frames->SetValue (wxString::Format (wxT ("%d"), f));
+	/* Do this calculation with frames so that we can round
+	   to a frame boundary at the start rather than the end.
+	*/
+	int64_t f = rint (t.seconds() * fps);
+	
+	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;
+
+	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));
 }
 
-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;
 }
 
 void
-Timecode::changed (wxCommandEvent &)
+Timecode::changed ()
 {
 	_set_button->Enable (true);
 }
 
 void
-Timecode::set_clicked (wxCommandEvent &)
+Timecode::set_clicked ()
 {
 	Changed ();
 	_set_button->Enable (false);
 }
+
+void
+Timecode::set_editable (bool e)
+{
+	_editable->Show (e);
+	_fixed->Show (!e);
+	_sizer->Layout ();
+}