Merge master.

[dcpomatic.git] / src / wx / timecode.cc

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index b23ff2a39203842feac9805fb811d7b0e351bbfd..1ab4b590b2b130b4f7d0c80cd21c766c6706ff41 100644 (file)
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -26,7 +26,7 @@ using std::string;
 using std::cout;
 using boost::lexical_cast;
 
-DCPTimecode::DCPTimecode (wxWindow* parent)
+Timecode::Timecode (wxWindow* parent)
        : wxPanel (parent)
 {
        wxClientDC dc (parent);
@@ -58,7 +58,7 @@ DCPTimecode::DCPTimecode (wxWindow* parent)
        _seconds = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
        _seconds->SetMaxLength (2);
        editable_sizer->Add (_seconds);
-       add_label_to_sizer (editable_sizer, _editable, wxT ("."), false);
+       add_label_to_sizer (editable_sizer, _editable, wxT (":"), false);
        _frames = new wxTextCtrl (_editable, wxID_ANY, wxT(""), wxDefaultPosition, size, 0, validator);
        _frames->SetMaxLength (2);
        editable_sizer->Add (_frames);
@@ -69,11 +69,11 @@ DCPTimecode::DCPTimecode (wxWindow* parent)
 
        _fixed = add_label_to_sizer (_sizer, this, wxT ("42"), false);
        
-       _hours->Bind      (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
-       _minutes->Bind    (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
-       _seconds->Bind    (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
-       _frames->Bind     (wxEVT_COMMAND_TEXT_UPDATED,   boost::bind (&DCPTimecode::changed, this));
-       _set_button->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPTimecode::set_clicked, this));
+       _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);
 
@@ -83,55 +83,59 @@ DCPTimecode::DCPTimecode (wxWindow* parent)
 }
 
 void
-DCPTimecode::set (DCPTime 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;
+       /* 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.%02d", h, m, s, f));
+       _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02" wxLongLongFmtSpec "d", h, m, s, f));
 }
 
 DCPTime
-DCPTimecode::get (int fps) const
+Timecode::get (int fps) const
 {
-       DCPTime 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
-DCPTimecode::changed ()
+Timecode::changed ()
 {
        _set_button->Enable (true);
 }
 
 void
-DCPTimecode::set_clicked ()
+Timecode::set_clicked ()
 {
        Changed ();
        _set_button->Enable (false);
 }
 
 void
-DCPTimecode::set_editable (bool e)
+Timecode::set_editable (bool e)
 {
        _editable->Show (e);
        _fixed->Show (!e);