From a07b5d79f2ac072d550ccb5587fe527c5340e248 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 29 Jun 2016 16:46:30 +0100 Subject: [PATCH] Small tweaks to times in progress reports. --- src/lib/encoder.cc | 2 +- src/lib/util.cc | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc index 6a604ab51..cc2deaa93 100644 --- a/src/lib/encoder.cc +++ b/src/lib/encoder.cc @@ -53,7 +53,7 @@ using boost::weak_ptr; using boost::optional; using dcp::Data; -int const Encoder::_history_size = 25; +int const Encoder::_history_size = 200; /** @param f Film that we are encoding */ Encoder::Encoder (shared_ptr film, shared_ptr writer) diff --git a/src/lib/util.cc b/src/lib/util.cc index bb74c168d..f3795c264 100644 --- a/src/lib/util.cc +++ b/src/lib/util.cc @@ -139,8 +139,8 @@ seconds_to_approximate_hms (int s) SafeStringStream ap; bool const hours = h > 0; - bool const minutes = h < 10 && m > 0; - bool const seconds = m < 10 && s > 0; + bool const minutes = h < 6 && m > 0; + bool const seconds = h == 0 && m < 10 && s > 0; if (hours) { if (m > 30 && !minutes) { @@ -151,7 +151,7 @@ seconds_to_approximate_hms (int s) ap << h << _("h"); } - if (minutes | seconds) { + if (minutes || seconds) { ap << N_(" "); } } -- 2.30.2