X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fvideo_content.cc;h=de3d3f3a2382e887ba31c10087d1c01834f6a598;hb=fe933ebb2c55b4235fcba5d02af2ba91c272fc88;hp=51d6ba418f8848e9d32862fc91da113bec60788a;hpb=769d56b7f3b2fe78036b4ba12c0cfe71734b379d;p=dcpomatic.git

diff --git a/src/lib/video_content.cc b/src/lib/video_content.cc
index 51d6ba418..de3d3f3a2 100644
--- a/src/lib/video_content.cc
+++ b/src/lib/video_content.cc
@@ -86,17 +86,20 @@ VideoContent::VideoContent (Content* parent)
 }
 
 
+/** @param video_range_hint Video range to use if none is given in the XML */
 shared_ptr<VideoContent>
-VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version)
+VideoContent::from_xml (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint)
 {
 	if (!node->optional_number_child<int> ("VideoWidth")) {
 		return {};
 	}
 
-	return make_shared<VideoContent>(parent, node, version);
+	return make_shared<VideoContent>(parent, node, version, video_range_hint);
 }
 
-VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version)
+
+/** @param video_range_hint Video range to use if none is given in the XML */
+VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int version, VideoRange video_range_hint)
 	: ContentPart (parent)
 {
 	_size.width = node->number_child<int> ("VideoWidth");
@@ -185,8 +188,12 @@ VideoContent::VideoContent (Content* parent, cxml::ConstNodePtr node, int versio
 		_fade_in = _fade_out = 0;
 	}
 
-	_range = VideoRange::FULL;
-	if (node->optional_string_child("Range").get_value_or("full") == "video") {
+	auto video_range = node->optional_string_child("Range");
+	if (!video_range) {
+		_range = video_range_hint;
+	} else if (*video_range == "full") {
+		_range = VideoRange::FULL;
+	} else {
 		_range = VideoRange::VIDEO;
 	}
 
@@ -522,6 +529,12 @@ VideoContent::set_length (Frame len)
 	maybe_set (_length, len, ContentProperty::LENGTH);
 }
 
+void
+VideoContent::set_crop (Crop c)
+{
+	maybe_set (_crop, c, VideoContentProperty::CROP);
+}
+
 void
 VideoContent::set_left_crop (int c)
 {