X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=23c83d037ba7b2432fe671127d89c80b9d249d32;hb=f17c1575ec037e3ac2ec95f2725335ca306fd700;hp=2b045f5c4c2fcef84503e4dc32874501deb94420;hpb=d9b4e65b92e28f9126fac7660d7aba97fc1ca4ad;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 2b045f5c4..23c83d037 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1067,7 +1067,7 @@ Film::maybe_add_content (weak_ptr<Job> j, weak_ptr<Content> c, bool disable_audi
 		playlist->add (content);
 		boost::signals2::connection c;
 		JobManager::instance()->analyse_audio (
-			shared_from_this (), playlist, c, bind (&Film::audio_analysis_finished, this)
+			shared_from_this(), playlist, false, c, bind (&Film::audio_analysis_finished, this)
 			);
 		_audio_analysis_connections.push_back (c);
 	}
@@ -1086,9 +1086,7 @@ Film::add_content (shared_ptr<Content> c)
 	if (_template_film) {
 		/* Take settings from the first piece of content of c's type in _template */
 		BOOST_FOREACH (shared_ptr<Content> i, _template_film->content()) {
-			if (typeid(i.get()) == typeid(c.get())) {
-				c->take_settings_from (i);
-			}
+			c->take_settings_from (i);
 		}
 	}
 
@@ -1215,7 +1213,9 @@ Film::make_kdm (
 	boost::filesystem::path cpl_file,
 	dcp::LocalTime from,
 	dcp::LocalTime until,
-	dcp::Formulation formulation
+	dcp::Formulation formulation,
+	int disable_forensic_marking_picture,
+	int disable_forensic_marking_audio
 	) const
 {
 	if (!_encrypted) {
@@ -1266,7 +1266,7 @@ Film::make_kdm (
 
 	return dcp::DecryptedKDM (
 		cpl->id(), keys, from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string()
-		).encrypt (signer, recipient, trusted_devices, formulation);
+		).encrypt (signer, recipient, trusted_devices, formulation, disable_forensic_marking_picture, disable_forensic_marking_audio);
 }
 
 /** @param screens Screens to make KDMs for.
@@ -1281,7 +1281,9 @@ Film::make_kdms (
 	boost::filesystem::path cpl_file,
 	boost::posix_time::ptime from,
 	boost::posix_time::ptime until,
-	dcp::Formulation formulation
+	dcp::Formulation formulation,
+	int disable_forensic_marking_picture,
+	int disable_forensic_marking_audio
 	) const
 {
 	list<ScreenKDM> kdms;
@@ -1294,7 +1296,9 @@ Film::make_kdms (
 				cpl_file,
 				dcp::LocalTime (from, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 				dcp::LocalTime (until, i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-				formulation
+				formulation,
+				disable_forensic_marking_picture,
+				disable_forensic_marking_audio
 				);
 
 			kdms.push_back (ScreenKDM (i, kdm));