X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Ffilm.cc;h=2a50e8c81dd732d360cf2f93147c253d355b7942;hb=9d049dc062df1c134105ec6a042aa9f56ae9c067;hp=93459661be39463c8cd257ee3ac3611ea85e33f1;hpb=a9dde34b8772ef8b985af067e2ff709be4e3cab6;p=dcpomatic.git

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 93459661b..2a50e8c81 100644
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -180,7 +180,8 @@ Film::Film (optional<boost::filesystem::path> dir)
 		boost::filesystem::path result;
 		for (boost::filesystem::path::iterator i = p.begin(); i != p.end(); ++i) {
 			if (*i == "..") {
-				if (boost::filesystem::is_symlink (result) || result.filename() == "..") {
+				boost::system::error_code ec;
+				if (boost::filesystem::is_symlink(result, ec) || result.filename() == "..") {
 					result /= *i;
 				} else {
 					result = result.parent_path ();
@@ -225,7 +226,8 @@ Film::video_identifier () const
 		+ "_" + raw_convert<string>(j2k_bandwidth());
 
 	if (encrypted ()) {
-		s += "_E";
+		/* This is insecure but hey, the key is in plaintext in metadata.xml */
+		s += "_E" + _key.hex();
 	} else {
 		s += "_P";
 	}
@@ -318,6 +320,10 @@ Film::make_dcp (bool gui, bool check)
 		throw runtime_error (_("You must add some content to the DCP before creating it"));
 	}
 
+	if (length() == DCPTime()) {
+		throw runtime_error (_("The DCP is empty, perhaps because all the content has zero length."));
+	}
+
 	if (dcp_content_type() == 0) {
 		throw MissingSettingError (_("content type"));
 	}
@@ -421,6 +427,7 @@ Film::metadata (bool with_content_paths) const
 	BOOST_FOREACH (dcp::Rating i, _ratings) {
 		i.as_xml (root->add_child("Rating"));
 	}
+	root->add_child("ContentVersion")->add_child_text(_content_version);
 	_playlist->as_xml (root->add_child ("Playlist"), with_content_paths);
 
 	return doc;
@@ -564,6 +571,8 @@ Film::read_metadata (optional<boost::filesystem::path> path)
 		_ratings.push_back (dcp::Rating(i));
 	}
 
+	_content_version = f.optional_string_child("ContentVersion").get_value_or("");
+
 	list<string> notes;
 	_playlist->set_from_xml (shared_from_this(), f.node_child ("Playlist"), _state_version, notes);
 
@@ -813,14 +822,21 @@ Film::isdcf_name (bool if_created_now) const
 
 	/* Count mapped audio channels */
 
-	pair<int, int> ch = audio_channel_types (mapped_audio_channels(), audio_channels());
+	list<int> mapped = mapped_audio_channels ();
+
+	pair<int, int> ch = audio_channel_types (mapped, audio_channels());
 	if (!ch.first && !ch.second) {
 		d += "_MOS";
 	} else if (ch.first) {
 		d += String::compose("_%1%2", ch.first, ch.second);
 	}
 
-	/* XXX: HI/VI */
+	if (audio_channels() > static_cast<int>(dcp::HI) && find(mapped.begin(), mapped.end(), dcp::HI) != mapped.end()) {
+		d += "-HI";
+	}
+	if (audio_channels() > static_cast<int>(dcp::VI) && find(mapped.begin(), mapped.end(), dcp::VI) != mapped.end()) {
+		d += "-VI";
+	}
 
 	d += "_" + resolution_to_string (_resolution);
 
@@ -1268,6 +1284,9 @@ Film::playlist_content_change (ChangeType type, weak_ptr<Content> c, int p, bool
 
 	if (type == CHANGE_TYPE_DONE) {
 		emit (boost::bind (boost::ref (ContentChange), type, c, p, frequent));
+		if (!frequent) {
+			check_settings_consistency ();
+		}
 	} else {
 		ContentChange (type, c, p, frequent);
 	}
@@ -1280,28 +1299,36 @@ Film::playlist_change (ChangeType type)
 	signal_change (type, NAME);
 
 	if (type == CHANGE_TYPE_DONE) {
-		/* Check that this change hasn't made our settings inconsistent */
-		bool change_made = false;
-		BOOST_FOREACH (shared_ptr<Content> i, content()) {
-			shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
-			if (!d) {
-				continue;
-			}
+		check_settings_consistency ();
+	}
+}
 
-			string why_not;
-			if (d->reference_video() && !d->can_reference_video(shared_from_this(), why_not)) {
-				d->set_reference_video(false);
-				change_made = true;
-			}
-			if (d->reference_audio() && !d->can_reference_audio(shared_from_this(), why_not)) {
-				d->set_reference_audio(false);
-				change_made = true;
-			}
+/** Check for (and if necessary fix) impossible settings combinations, like
+ *  video set to being referenced when it can't be.
+ */
+void
+Film::check_settings_consistency ()
+{
+	bool change_made = false;
+	BOOST_FOREACH (shared_ptr<Content> i, content()) {
+		shared_ptr<DCPContent> d = dynamic_pointer_cast<DCPContent>(i);
+		if (!d) {
+			continue;
 		}
 
-		if (change_made) {
-			Message (_("DCP-o-matic had to change your settings for referring to DCPs as OV.  Please review those settings to make sure they are what you want."));
+		string why_not;
+		if (d->reference_video() && !d->can_reference_video(shared_from_this(), why_not)) {
+			d->set_reference_video(false);
+			change_made = true;
 		}
+		if (d->reference_audio() && !d->can_reference_audio(shared_from_this(), why_not)) {
+			d->set_reference_audio(false);
+			change_made = true;
+		}
+	}
+
+	if (change_made) {
+		Message (_("DCP-o-matic had to change your settings for referring to DCPs as OV.  Please review those settings to make sure they are what you want."));
 	}
 }
 
@@ -1587,29 +1614,29 @@ Film::reels () const
 		break;
 	case REELTYPE_BY_VIDEO_CONTENT:
 	{
-		optional<DCPTime> last_split;
-		shared_ptr<Content> last_video;
-		BOOST_FOREACH (shared_ptr<Content> c, content ()) {
+		/* Collect all reel boundaries */
+		list<DCPTime> split_points;
+		split_points.push_back (DCPTime());
+		split_points.push_back (len);
+		BOOST_FOREACH (shared_ptr<Content> c, content()) {
 			if (c->video) {
 				BOOST_FOREACH (DCPTime t, c->reel_split_points(shared_from_this())) {
-					if (last_split) {
-						p.push_back (DCPTimePeriod (last_split.get(), t));
-					}
-					last_split = t;
+					split_points.push_back (t);
 				}
-				last_video = c;
+				split_points.push_back (c->end(shared_from_this()));
 			}
 		}
 
-		DCPTime video_end = last_video ? last_video->end(shared_from_this()) : DCPTime(0);
-		if (last_split) {
-			/* Definitely go from the last split to the end of the video content */
-			p.push_back (DCPTimePeriod (last_split.get(), video_end));
-		}
+		split_points.sort ();
+		split_points.unique ();
 
-		if (video_end < len) {
-			/* And maybe go after that as well if there is any non-video hanging over the end */
-			p.push_back (DCPTimePeriod (video_end, len));
+		/* Make them into periods */
+		optional<DCPTime> last;
+		BOOST_FOREACH (DCPTime t, split_points) {
+			if (last) {
+				p.push_back (DCPTimePeriod(*last, t));
+			}
+			last = t;
 		}
 		break;
 	}
@@ -1739,6 +1766,13 @@ Film::set_ratings (vector<dcp::Rating> r)
 	_ratings = r;
 }
 
+void
+Film::set_content_version (string v)
+{
+	ChangeSignaller<Film> ch (this, CONTENT_VERSION);
+	_content_version = v;
+}
+
 optional<DCPTime>
 Film::marker (dcp::Marker type) const
 {