From 645c667e29150190d6eb89e2237c4ec717c2d1b5 Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Fri, 17 Aug 2018 02:15:02 +0100 Subject: [PATCH 1/1] Adjust for Interop not needing content. --- src/dcp.cc | 24 +++++++++++++++++++----- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/dcp.cc b/src/dcp.cc index 232c1443..58195d4b 100644 --- a/src/dcp.cc +++ b/src/dcp.cc @@ -143,12 +143,26 @@ DCP::read (bool keep_going, ReadErrors* errors, bool ignore_incorrect_picture_mx if (starts_with (p, "file://")) { p = p.substr (7); } - optional pkl_bool = i->optional_string_child("PackingList"); - if (pkl_bool && *pkl_bool == "true") { - pkl_path = p; - } else { - paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + switch (*_standard) { + case INTEROP: + if (i->optional_node_child("PackingList")) { + pkl_path = p; + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; + case SMPTE: + { + optional pkl_bool = i->optional_string_child("PackingList"); + if (pkl_bool && *pkl_bool == "true") { + pkl_path = p; + } else { + paths.insert (make_pair (remove_urn_uuid (i->string_child ("Id")), p)); + } + break; } + } + } if (!pkl_path) { -- 2.30.2