X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=718d6c61db1d6281f4f33c96a80bdd29cbe8b9a4;hb=d311043bf3c1e3e7f41b314f7ab7c91ed7e5aa7f;hp=d0f0106c49b6fb0e2906b53468d76e3e71190e25;hpb=94ab538738526948c5a52ed1222be1e484255541;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index d0f0106c4..718d6c61d 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -74,12 +74,12 @@ #include #include #include -#include -#include #include #include #include +#include #include +#include #include "i18n.h" @@ -155,7 +155,7 @@ int const Film::current_state_version = 38; Film::Film (optional dir) : _playlist (new Playlist) - , _use_isdcf_name (true) + , _use_isdcf_name (Config::instance()->use_isdcf_name_by_default()) , _dcp_content_type (Config::instance()->default_dcp_content_type ()) , _container (Config::instance()->default_container ()) , _resolution (Resolution::TWO_K) @@ -1283,6 +1283,7 @@ Film::set_isdcf_date_today () _isdcf_date = boost::gregorian::day_clock::local_day (); } + boost::filesystem::path Film::j2c_path (int reel, Frame frame, Eyes eyes, bool tmp) const {