Make DCPExaminer::size() optional and deal with the consequences.

[dcpomatic.git] / src / tools / dcpomatic_player.cc

diff --git a/src/tools/dcpomatic_player.cc b/src/tools/dcpomatic_player.cc
index 9c7522bc589af6f11d846a78fd38071c7063a9c6..e658395211c5b040cce4b191518b641ea477ab9d 100644 (file)
--- 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);
                                }