From: Carl Hetherington <cth@carlh.net>
Date: Sun, 24 Apr 2016 22:49:53 +0000 (+0100)
Subject: KDM AnnotationText tags are optional.
X-Git-Tag: v2.7.15~5
X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=commitdiff_plain;h=7bd4ecce60488f7f7cfbdcc16ba7022b979a891d

KDM AnnotationText tags are optional.
---

diff --git a/cscript b/cscript
index e62188d30..b2968f02c 100644
--- a/cscript
+++ b/cscript
@@ -229,7 +229,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'f2952f3', ffmpeg_options),
-            ('libdcp', '3bf3aad'),
+            ('libdcp', 'd926e11'),
             ('libsub', 'b9fb00d'))
 
 def configure_options(target):
diff --git a/src/tools/dcpomatic_kdm.cc b/src/tools/dcpomatic_kdm.cc
index 0c4141ced..1f61aad51 100644
--- a/src/tools/dcpomatic_kdm.cc
+++ b/src/tools/dcpomatic_kdm.cc
@@ -273,7 +273,7 @@ private:
 				dcp::DecryptedKDM kdm (
 					dcp::LocalTime (_timing->from(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
 					dcp::LocalTime (_timing->until(), i->cinema->utc_offset_hour(), i->cinema->utc_offset_minute()),
-					decrypted.annotation_text(),
+					decrypted.annotation_text().get_value_or (""),
 					decrypted.content_title_text(),
 					dcp::LocalTime().as_string()
 					);
@@ -296,7 +296,7 @@ private:
 					wxString::Format (s, int(screen_kdms.size()), std_to_wx(_output->directory().string()).data())
 					);
 			} else {
-				string film_name = decrypted.annotation_text ();
+				string film_name = decrypted.annotation_text().get_value_or ("");
 				if (film_name.empty ()) {
 					film_name = decrypted.content_title_text ();
 				}