From: Carl Hetherington <cth@carlh.net>
Date: Sun, 14 Aug 2016 23:17:58 +0000 (+0100)
Subject: Fix loading of some old metadata versions.
X-Git-Tag: v2.9.11~1
X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=ceeb74f2059005f604d00d955c68cb5be4ded284

Fix loading of some old metadata versions.
---

diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc
index 44c7ce578..d866a6b86 100644
--- a/src/lib/dcp_content.cc
+++ b/src/lib/dcp_content.cc
@@ -85,7 +85,10 @@ DCPContent::DCPContent (shared_ptr<const Film> film, cxml::ConstNodePtr node, in
 		AudioStreamPtr (
 			new AudioStream (
 				node->number_child<int> ("AudioFrameRate"),
-				node->number_child<Frame> ("AudioLength"),
+				/* AudioLength was not present in some old metadata versions */
+				node->optional_number_child<Frame>("AudioLength").get_value_or (
+					video->length() * node->number_child<int>("AudioFrameRate") / video_frame_rate().get()
+					),
 				AudioMapping (node->node_child ("AudioMapping"), version)
 				)
 			)