diff options
| author | Carl Hetherington <cth@carlh.net> | 2014-03-04 21:25:44 +0000 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2014-03-04 21:25:44 +0000 |
| commit | c8636a2ce85eb3073ac5a32a89f9d77031366dc2 (patch) | |
| tree | 532c35eba064c1f8f9294aba1b56142b51c6b0fc /src | |
| parent | 5f66a692647fc901f7dca709ad08c65010bd84e7 (diff) | |
Stop old versions of DCP-o-matic loading new state files. Fix missing content type setup in dcpomatic_create.
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/film.cc | 3 | ||||
| -rw-r--r-- | src/tools/dcpomatic_create.cc | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/src/lib/film.cc b/src/lib/film.cc index 00beb870f..1b724b27e 100644 --- a/src/lib/film.cc +++ b/src/lib/film.cc @@ -397,6 +397,9 @@ Film::read_metadata () f.read_file (file ("metadata.xml")); _state_version = f.number_child<int> ("Version"); + if (_state_version > current_state_version) { + throw StringError (_("This film was created with a newer version of DCP-o-matic, and it cannot be loaded into this version. Sorry!")); + } _name = f.string_child ("Name"); _use_dci_name = f.bool_child ("UseDCIName"); diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 4f737dd5a..a079a95cb 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -150,6 +150,7 @@ main (int argc, char* argv[]) } film->set_container (container_ratio); + film->set_dcp_content_type (dcp_content_type); for (int i = optind; i < argc; ++i) { shared_ptr<Content> c = content_factory (film, argv[i]); |