Disallow refer if the film frame size is not the same as the DCP (#963).

3 files changed, 9 insertions, 2 deletions

diff --git a/ChangeLog b/ChangeLog
index 46f74aeea..9454fb1d9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2016-09-26  c.hetherington  <cth@carlh.net>
 
+	* Disallow refer-to-DCP if the video frame size is different to that in the project (#963).
+
 	* Fix multi-select in the timeline (#954).
 
 	* Add option to Windows installer to add desktop shortcuts (#965).
diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 96e9f17a2..1f844541c 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -444,6 +444,11 @@ DCPContent::can_reference (function<shared_ptr<ContentPart> (shared_ptr<const Co
 bool
 DCPContent::can_reference_video (list<string>& why_not) const
 {
+	if (film()->frame_size() != video->size()) {
+		why_not.push_back (_("The video frame size in the film differs from that in the DCP."));
+		return false;
+	}
+
 	return can_reference (bind (&Content::video, _1), _("There is other video content overlapping this DCP; remove it."), why_not);
 }
 
@@ -458,7 +463,7 @@ DCPContent::can_reference_audio (list<string>& why_not) const
                 }
         }
 
-        return can_reference (bind (&Content::audio, _1),   _("There is other audio content overlapping this DCP; remove it."), why_not);
+        return can_reference (bind (&Content::audio, _1), _("There is other audio content overlapping this DCP; remove it."), why_not);
 }
 
 bool
diff --git a/src/wx/video_panel.cc b/src/wx/video_panel.cc
index 177799208..6f9efef61 100644
--- a/src/wx/video_panel.cc
+++ b/src/wx/video_panel.cc
@@ -253,10 +253,10 @@ VideoPanel::film_changed (Film::Property property)
 {
 	switch (property) {
 	case Film::VIDEO_FRAME_RATE:
+	case Film::CONTAINER:
 		setup_description ();
 		setup_sensitivity ();
 		break;
-	case Film::CONTAINER:
 	case Film::RESOLUTION:
 		setup_description ();
 		break;