All audio content should resample if the output frame rate and content

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

diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc
index 033bd2bd01e97f29965829c8c28c20bd37fa2a3b..ee5b5604bef4189e95329a360525be0e0bfbaf7b 100644 (file)
--- a/src/wx/timecode.cc
+++ b/src/wx/timecode.cc
@@ -58,7 +58,7 @@ Timecode::Timecode (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);
@@ -85,20 +85,24 @@ Timecode::Timecode (wxWindow* parent)
 void
 Timecode::set (Time 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 = divide_with_round (t * fps, TIME_HZ);
+       
+       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));
 }
 
 Time