X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=d331516dd1e9cac9c7b9b979975a1d4578927266;hb=83efe84020dc0ba2801c4b305448790720fe133f;hp=13a03d929602a1e05c5a1a558b1127e8e999aeec;hpb=54038beb4437c027e584fc95110f6fd4dbf2207d;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 13a03d929..d331516dd 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -132,6 +132,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _resolution (RESOLUTION_2K)
 	, _signed (true)
 	, _encrypted (false)
+	, _context_id (dcp::make_uuid ())
 	, _j2k_bandwidth (Config::instance()->default_j2k_bandwidth ())
 	, _isdcf_metadata (Config::instance()->default_isdcf_metadata ())
 	, _video_frame_rate (24)
@@ -361,6 +362,7 @@ Film::metadata (bool with_content_paths) const
 	root->add_child("Signed")->add_child_text (_signed ? "1" : "0");
 	root->add_child("Encrypted")->add_child_text (_encrypted ? "1" : "0");
 	root->add_child("Key")->add_child_text (_key.hex ());
+	root->add_child("ContextID")->add_child_text (_context_id);
 	if (_audio_processor) {
 		root->add_child("AudioProcessor")->add_child_text (_audio_processor->id ());
 	}
@@ -463,6 +465,7 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 	_three_d = f.bool_child ("ThreeD");
 	_interop = f.bool_child ("Interop");
 	_key = dcp::Key (f.string_child ("Key"));
+	_context_id = f.optional_string_child("ContextID").get_value_or (dcp::make_uuid ());
 
 	if (f.optional_string_child ("AudioProcessor")) {
 		_audio_processor = AudioProcessor::from_id (f.string_child ("AudioProcessor"));
@@ -1027,13 +1030,6 @@ Film::content () const
 	return _playlist->content ();
 }
 
-void
-Film::examine_content (shared_ptr<Content> c)
-{
-	shared_ptr<Job> j (new ExamineContentJob (shared_from_this(), c));
-	JobManager::instance()->add (j);
-}
-
 void
 Film::examine_and_add_content (shared_ptr<Content> c)
 {