summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2016-04-24 23:49:53 +0100
committerCarl Hetherington <cth@carlh.net>2016-04-24 23:49:53 +0100
commit7bd4ecce60488f7f7cfbdcc16ba7022b979a891d (patch)
tree765a29de1b26ce7d4575581bee0613592104d136 /src
parent28af00e58684a880ed188b24a4f5d81d5e77db38 (diff)
KDM AnnotationText tags are optional.
Diffstat (limited to 'src')
-rw-r--r--src/tools/dcpomatic_kdm.cc4
1 files changed, 2 insertions, 2 deletions
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 ();
}