X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=71836f2540fc1fa617241cf2a622fc1e34283527;hb=bdbb254c18b100f8fa66a3707f6b515309d05685;hp=b1b86898403fdbb62c39b6fe1bc9e42eed0bd9c7;hpb=4ec1def1154d3d6b305bf556bf227df7b4f74b16;p=dcpomatic.git diff --git a/src/lib/film.cc b/src/lib/film.cc index b1b868984..71836f254 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -81,7 +81,7 @@ using boost::optional; using libdcp::Size; using libdcp::Signer; -int const Film::state_version = 4; +int const Film::state_version = 5; /** Construct a Film object in a given directory. * @@ -372,6 +372,8 @@ Film::read_metadata () cxml::Document f ("Metadata"); f.read_file (file ("metadata.xml")); + + int const version = f.number_child ("Version"); _name = f.string_child ("Name"); _use_dci_name = f.bool_child ("UseDCIName"); @@ -403,7 +405,7 @@ Film::read_metadata () _three_d = f.bool_child ("ThreeD"); _interop = f.bool_child ("Interop"); _key = libdcp::Key (f.string_child ("Key")); - _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist")); + _playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), version); _dirty = false; }