Improve approximate time reporting a bit (#383).

[dcpomatic.git] / src / lib / util.cc

diff --git a/src/lib/util.cc b/src/lib/util.cc
index e8116536526b0b0af4f20f64deafceae6adfc5e2..6f39073910e8ee055c3197535ee3cc98dd35cee0 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -143,25 +143,54 @@ seconds_to_approximate_hms (int s)
        m -= (h * 60);
 
        stringstream ap;
-       
-       if (h > 0) {
-               if (m > 30) {
+
+       bool const hours = h > 0;
+       bool const minutes = h < 10 && m > 0;
+       bool const seconds = m < 10 && s > 0;
+
+       if (hours) {
+               if (m > 30 && !minutes) {
                        ap << (h + 1) << N_(" ") << _("hours");
                } else {
+                       ap << h << N_(" ");
                        if (h == 1) {
-                               ap << N_("1 ") << _("hour");
+                               ap << _("hour");
                        } else {
-                               ap << h << N_(" ") << _("hours");
+                               ap << _("hours");
                        }
                }
-       } else if (m > 0) {
-               if (m == 1) {
-                       ap << N_("1 ") << _("minute");
+
+               if (minutes | seconds) {
+                       ap << N_(" ");
+               }
+       }
+
+       if (minutes) {
+               /* Minutes */
+               if (s > 30 && !seconds) {
+                       ap << (m + 1) << N_(" ") << _("minutes");
                } else {
-                       ap << m << N_(" ") << _("minutes");
+                       ap << m << N_(" ");
+                       if (m == 1) {
+                               ap << _("minute");
+                       } else {
+                               ap << _("minutes");
+                       }
+               }
+
+               if (seconds) {
+                       ap << N_(" ");
+               }
+       }
+
+       if (seconds) {
+               /* Seconds */
+               ap << s << N_(" ");
+               if (s == 1) {
+                       ap << _("second");
+               } else {
+                       ap << _("seconds");
                }
-       } else {
-               ap << s << N_(" ") << _("seconds");
        }
 
        return ap.str ();
@@ -266,8 +295,9 @@ LONG WINAPI exception_handler(struct _EXCEPTION_POINTERS *)
 {
        dbg::stack s;
        FILE* f = fopen_boost (backtrace_file, "w");
+       fprintf (f, "Exception thrown:");
        for (dbg::stack::const_iterator i = s.begin(); i != s.end(); ++i) {
-               fprintf (f, "%p %s %d %s", i->instruction, i->function.c_str(), i->line, i->module.c_str());
+               fprintf (f, "%p %s %d %s\n", i->instruction, i->function.c_str(), i->line, i->module.c_str());
        }
        fclose (f);
        return EXCEPTION_CONTINUE_SEARCH;
@@ -282,7 +312,8 @@ terminate ()
 
        try {
                // try once to re-throw currently active exception
-               if (!tried_throw++) {
+               if (!tried_throw) {
+                       tried_throw = true;
                        throw;
                }
        }
@@ -464,33 +495,6 @@ md5_digest (vector<boost::filesystem::path> files, shared_ptr<Job> job)
        return digester.get ();
 }
 
-static bool
-about_equal (float a, float b)
-{
-       /* A film of F seconds at f FPS will be Ff frames;
-          Consider some delta FPS d, so if we run the same
-          film at (f + d) FPS it will last F(f + d) seconds.
-
-          Hence the difference in length over the length of the film will
-          be F(f + d) - Ff frames
-           = Ff + Fd - Ff frames
-           = Fd frames
-           = Fd/f seconds
- 
-          So if we accept a difference of 1 frame, ie 1/f seconds, we can
-          say that
-
-          1/f = Fd/f
-       ie 1 = Fd
-       ie d = 1/F
- 
-          So for a 3hr film, ie F = 3 * 60 * 60 = 10800, the acceptable
-          FPS error is 1/F ~= 0.0001 ~= 10-e4
-       */
-
-       return (fabs (a - b) < 1e-4);
-}
-
 /** @param An arbitrary audio frame rate.
  *  @return The appropriate DCP-approved frame rate (48kHz or 96kHz).
  */
@@ -788,44 +792,6 @@ audio_channel_name (int c)
        return channels[c];
 }
 
-FrameRateConversion::FrameRateConversion (float source, int dcp)
-       : skip (false)
-       , repeat (1)
-       , change_speed (false)
-{
-       if (fabs (source / 2.0 - dcp) < fabs (source - dcp)) {
-               /* The difference between source and DCP frame rate will be lower
-                  (i.e. better) if we skip.
-               */
-               skip = true;
-       } else if (fabs (source * 2 - dcp) < fabs (source - dcp)) {
-               /* The difference between source and DCP frame rate would be better
-                  if we repeated each frame once; it may be better still if we
-                  repeated more than once.  Work out the required repeat.
-               */
-               repeat = round (dcp / source);
-       }
-
-       change_speed = !about_equal (source * factor(), dcp);
-
-       if (!skip && repeat == 1 && !change_speed) {
-               description = _("Content and DCP have the same rate.\n");
-       } else {
-               if (skip) {
-                       description = _("DCP will use every other frame of the content.\n");
-               } else if (repeat == 2) {
-                       description = _("Each content frame will be doubled in the DCP.\n");
-               } else if (repeat > 2) {
-                       description = String::compose (_("Each content frame will be repeated %1 more times in the DCP.\n"), repeat - 1);
-               }
-
-               if (change_speed) {
-                       float const pc = dcp * 100 / (source * factor());
-                       description += String::compose (_("DCP will run at %1%% of the content speed.\n"), pc);
-               }
-       }
-}
-
 bool
 valid_image_file (boost::filesystem::path f)
 {