X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Fwx%2Ftimecode.cc;h=07cb0be6586b6485defff73b314ad2702fac87f5;hb=cc27c2716f755305d67f1e1ba828ecf37f8405dd;hp=1ab4b590b2b130b4f7d0c80cd21c766c6706ff41;hpb=854f2e5bbb7ffb9758b823af87034033033f3cb8;p=dcpomatic.git diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index 1ab4b590b..07cb0be65 100644 --- a/src/wx/timecode.cc +++ b/src/wx/timecode.cc @@ -85,24 +85,18 @@ Timecode::Timecode (wxWindow* parent) void Timecode::set (DCPTime t, int fps) { - /* 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; + int h; + int m; + int s; + int f; + t.split (fps, h, m, s, f); checked_set (_hours, lexical_cast (h)); checked_set (_minutes, lexical_cast (m)); checked_set (_seconds, lexical_cast (s)); checked_set (_frames, lexical_cast (f)); - _fixed->SetLabel (wxString::Format ("%02d:%02d:%02d.%02" wxLongLongFmtSpec "d", h, m, s, f)); + _fixed->SetLabel (std_to_wx (t.timecode (fps))); } DCPTime @@ -121,6 +115,16 @@ Timecode::get (int fps) const return t; } +void +Timecode::clear () +{ + checked_set (_hours, ""); + checked_set (_minutes, ""); + checked_set (_seconds, ""); + checked_set (_frames, ""); + _fixed->SetLabel (""); +} + void Timecode::changed () {