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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 392bb221b..2b045f5c4 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2017 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -151,7 +151,7 @@ Film::Film (optional<boost::filesystem::path> dir)
 	, _audio_processor (0)
 	, _reel_type (REELTYPE_SINGLE)
 	, _reel_length (2000000000)
-	, _upload_after_make_dcp (false)
+	, _upload_after_make_dcp (Config::instance()->default_upload_after_make_dcp())
 	, _state_version (current_state_version)
 	, _dirty (false)
 {
@@ -1087,7 +1087,7 @@ Film::add_content (shared_ptr<Content> c)
 		/* 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->use_template (i);
+				c->take_settings_from (i);
 			}
 		}
 	}
@@ -1218,6 +1218,10 @@ Film::make_kdm (
 	dcp::Formulation formulation
 	) const
 {
+	if (!_encrypted) {
+		throw runtime_error (_("Cannot make a KDM as this project is not encrypted."));
+	}
+
 	shared_ptr<const dcp::CPL> cpl (new dcp::CPL (cpl_file));
 	shared_ptr<const dcp::CertificateChain> signer = Config::instance()->signer_chain ();
 	if (!signer->valid ()) {
@@ -1520,42 +1524,6 @@ Film::content_summary (DCPTimePeriod period) const
 	return _playlist->content_summary (period);
 }
 
-list<string>
-Film::fix_conflicting_settings ()
-{
-	list<string> notes;
-
-	list<boost::filesystem::path> was_referencing;
-	BOOST_FOREACH (shared_ptr<Content> i, content()) {
-		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent> (i);
-		if (d) {
-			list<string> reasons;
-			bool was = false;
-			if (!d->can_reference_video(reasons) && d->reference_video()) {
-				d->set_reference_video (false);
-				was = true;
-			}
-			if (!d->can_reference_audio(reasons) && d->reference_audio()) {
-				d->set_reference_audio (false);
-				was = true;
-			}
-			if (!d->can_reference_subtitle(reasons) && d->reference_subtitle()) {
-				d->set_reference_subtitle (false);
-				was = true;
-			}
-			if (was) {
-				was_referencing.push_back (d->path(0).parent_path().filename());
-			}
-		}
-	}
-
-	BOOST_FOREACH (boost::filesystem::path d, was_referencing) {
-		notes.push_back (String::compose (_("The DCP %1 was being referred to by this film.  This not now possible because the reel sizes in the film no longer agree with those in the imported DCP.\n\nSetting the 'Reel type' to 'split by video content' will probably help.\n\nAfter doing that you would need to re-tick the appropriate 'refer to existing DCP' checkboxes."), d.string()));
-	}
-
-	return notes;
-}
-
 void
 Film::use_template (string name)
 {
@@ -1590,3 +1558,29 @@ Film::copy_from (shared_ptr<const Film> film)
 {
 	read_metadata (film->file (metadata_file));
 }
+
+bool
+Film::references_dcp_video () const
+{
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
+		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+		if (d && d->reference_video()) {
+			return true;
+		}
+	}
+
+	return false;
+}
+
+bool
+Film::references_dcp_audio () const
+{
+	BOOST_FOREACH (shared_ptr<Content> i, _playlist->content()) {
+		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+		if (d && d->reference_audio()) {
+			return true;
+		}
+	}
+
+	return false;
+}