diff options
| author | Carl Hetherington <cth@carlh.net> | 2016-09-26 12:41:08 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2016-09-26 12:41:08 +0100 |
| commit | d7c281ed96aad47c6d62b2f5697d93dcf76d4faa (patch) | |
| tree | c98621c6c82cf0ca24b2bfca2e1446b4b416bddd /src | |
| parent | f68a5f1ddd60ade2ed9a68d180ecf553e94b853f (diff) | |
Disallow refer if the film frame size is not the same as the DCP (#963).
Diffstat (limited to 'src')
| -rw-r--r-- | src/lib/dcp_content.cc | 7 | ||||
| -rw-r--r-- | src/wx/video_panel.cc | 2 |
2 files changed, 7 insertions, 2 deletions
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; |