Small tweaks to times in progress reports.

diff --git a/src/lib/encoder.cc b/src/lib/encoder.cc
index 6a604ab5174f24c71d2dbf88196b2204df81be70..cc2deaa9387333b2efbc9a3ed965611fb998c416 100644 (file)
--- 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<const Film> film, shared_ptr<Writer> writer)

diff --git a/src/lib/util.cc b/src/lib/util.cc
index bb74c168d17d96847219e04804c9fc86b02d016c..f3795c26406c75a6b4e286cde16510a93b2e8ca7 100644 (file)
--- 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_(" ");
                }
        }