X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fspl.cc;h=f49f11a7d26ac15cb8b1429b6bd64b36ee3618ac;hb=00301ddfa6a7f4c79593d8c86a0ff208aa3be68a;hp=8d0dcc6fc76df26b74e702adb1a8c14e8cf7f9d9;hpb=39fb8198febde1937019db1c300ec363aab5aa56;p=dcpomatic.git diff --git a/src/lib/spl.cc b/src/lib/spl.cc index 8d0dcc6fc..f49f11a7d 100644 --- a/src/lib/spl.cc +++ b/src/lib/spl.cc @@ -21,12 +21,13 @@ #include "content_store.h" #include "spl.h" -#include "warnings.h" #include +#include #include -DCPOMATIC_DISABLE_WARNINGS +#include +LIBDCP_DISABLE_WARNINGS #include -DCPOMATIC_ENABLE_WARNINGS +LIBDCP_ENABLE_WARNINGS #include @@ -42,7 +43,7 @@ SPL::read (boost::filesystem::path path, ContentStore* store) _spl.clear (); _missing = false; cxml::Document doc ("SPL"); - doc.read_file (path); + doc.read_file(dcp::filesystem::fix_long_path(path)); _id = doc.string_child("Id"); _name = doc.string_child("Name"); for (auto i: doc.node_children("Entry")) {