Merge branch 'master' of ssh://git.carlh.net/home/carl/git/dcpomatic

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 4ffe3bd12bb8ed4f76092286f8aad08ce4fe0691..abfdd2767c31a50f6a3342c684cc9fcea9a9c960 100644 (file)
--- a/src/lib/util.cc
+++ b/src/lib/util.cc
@@ -104,6 +104,7 @@ using dcp::locale_convert;
  *  in during App::onInit().
  */
 string program_name;
+bool is_batch_converter = false;
 static boost::thread::id ui_thread;
 static boost::filesystem::path backtrace_file;
 
@@ -127,6 +128,22 @@ seconds_to_hms (int s)
        return buffer;
 }
 
+string
+time_to_hmsf (DCPTime time, Frame rate)
+{
+       Frame f = time.frames_round (rate);
+       int s = f / rate;
+       f -= (s * rate);
+       int m = s / 60;
+       s -= m * 60;
+       int h = m / 60;
+       m -= h * 60;
+
+       char buffer[64];
+       snprintf (buffer, sizeof(buffer), "%d:%02d:%02d.%d", h, m, s, static_cast<int>(f));
+       return buffer;
+}
+
 /** @param s Number of seconds.
  *  @return String containing an approximate description of s (e.g. "about 2 hours")
  */
@@ -329,11 +346,11 @@ dcpomatic_setup ()
        avfilter_register_all ();
 
 #ifdef DCPOMATIC_OSX
-       /* Add our lib directory to the libltdl search path so that
+       /* Add our library directory to the libltdl search path so that
           xmlsec can find xmlsec1-openssl.
        */
        boost::filesystem::path lib = app_contents ();
-       lib /= "lib";
+       lib /= "Frameworks";
        setenv ("LTDL_LIBRARY_PATH", lib.c_str (), 1);
 #endif
 
@@ -557,7 +574,7 @@ valid_image_file (boost::filesystem::path f)
        return (
                ext == ".tif" || ext == ".tiff" || ext == ".jpg" || ext == ".jpeg" ||
                ext == ".png" || ext == ".bmp" || ext == ".tga" || ext == ".dpx" ||
-               ext == ".j2c" || ext == ".j2k" || ext == ".jp2"
+               ext == ".j2c" || ext == ".j2k" || ext == ".jp2" || ext == ".exr"
                );
 }
 
@@ -758,3 +775,13 @@ remap (shared_ptr<const AudioBuffers> input, int output_channels, AudioMapping m
 
        return mapped;
 }
+
+Eyes
+increment_eyes (Eyes e)
+{
+       if (e == EYES_LEFT) {
+               return EYES_RIGHT;
+       }
+
+       return EYES_LEFT;
+}