Allow + in DCP names for ISDCF RU rating strings.

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

diff --git a/src/lib/util.cc b/src/lib/util.cc
index 1f5b29101de78c7657a2341623590eed7b3ad92f..3eb5ee30e09e06831924988fd7d85e37f9d81ab4 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;
 
@@ -345,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
 
@@ -573,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"
                );
 }
 
@@ -717,7 +718,7 @@ careful_string_filter (string s)
        */
 
        string out;
-       string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.";
+       string const allowed = "0123456789ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz-_%.+";
        for (size_t i = 0; i < s.size(); ++i) {
                if (allowed.find (s[i]) != string::npos) {
                        out += s[i];
@@ -774,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;
+}