KDM AnnotationText tags are optional.

diff --git a/cscript b/cscript
index e62188d3084222a8face6a77fd298cd21bf944de..b2968f02cb90b2dd02cddcdb0154532f8f7c691a 100644 (file)
--- 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 0c4141cedc570eb44f1b02ffadd17969c350963c..1f61aad5139c918a12dc00013394b7c78bf679d2 100644 (file)
--- 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 ();
                                }