diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-03 12:54:07 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-03 12:54:07 +0000 |
| commit | 1629bd7df2150156109afbc7a16677cb29e82adf (patch) | |
| tree | f8d42b82976bf999eafd1abd499027a5ea5be02e /src/wx/timecode.cc | |
| parent | cc3900735839ff4b0da0c046b5c606c440ba917a (diff) | |
| parent | f0738a22fc7555c306d49bcd1c356ce210e2c0e2 (diff) | |
Merge master.
Diffstat (limited to 'src/wx/timecode.cc')
| -rw-r--r-- | src/wx/timecode.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wx/timecode.cc b/src/wx/timecode.cc index 493650aae..7208bd4c6 100644 --- 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); @@ -91,7 +91,7 @@ Timecode::set (DCPTime t, int fps) t -= m * 60 * TIME_HZ; int const s = t / TIME_HZ; t -= s * TIME_HZ; - int const f = t * fps / TIME_HZ; + int const f = divide_with_round (t * fps, TIME_HZ); checked_set (_hours, lexical_cast<string> (h)); checked_set (_minutes, lexical_cast<string> (m)); |