From 3ffd0163026be24e5373e0674c3301ed37546e44 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Wed, 21 Feb 2024 10:47:38 +0100 Subject: Make DCPExaminer::size() optional and deal with the consequences. This means we can fix the case of a VF having no known size in a nice way, in turn fixing problems caused by the fix to #2775. --- src/tools/dcpomatic_player.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'src/tools/dcpomatic_player.cc') diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc index 9c7522bc5..e65839521 100644 --- a/src/tools/dcpomatic_player.cc +++ b/src/tools/dcpomatic_player.cc @@ -477,8 +477,8 @@ public: j->set_use (true); } - if (i->video) { - auto const r = Ratio::nearest_from_ratio(i->video->size().ratio()); + if (i->video && i->video->size()) { + auto const r = Ratio::nearest_from_ratio(i->video->size()->ratio()); if (r->id() == "239") { /* Any scope content means we use scope */ _film->set_container(r); @@ -687,8 +687,8 @@ private: for (auto i: dcp->text) { i->set_use (true); } - if (dcp->video) { - auto const r = Ratio::nearest_from_ratio(dcp->video->size().ratio()); + if (dcp->video && dcp->video->size()) { + auto const r = Ratio::nearest_from_ratio(dcp->video->size()->ratio()); if (r) { _film->set_container(r); } -- cgit v1.2.3