From 46bc419019d4c24341a092e6ceb29642ca5f06dc Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sun, 12 Feb 2017 23:25:10 +0000 Subject: [PATCH] Use CPL annotation text for ASSETMAP and PKL (#1048). --- ChangeLog | 2 ++ cscript | 4 ++-- src/lib/writer.cc | 1 + 3 files changed, 5 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 84524fc23..60d63edde 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,7 @@ 2017-02-12 Carl Hetherington + * Use CPL's annotation text for ASSETMAP and PKL (#1048). + * Fix missing keys in VF KDMs (#975). 2017-02-10 Carl Hetherington diff --git a/cscript b/cscript index 7ced0c91e..4c1639a05 100644 --- a/cscript +++ b/cscript @@ -268,8 +268,8 @@ def dependencies(target): ffmpeg_options = {} return (('ffmpeg-cdist', 'c7df8d5', ffmpeg_options), - ('libdcp', 'db86ed5'), - ('libsub', 'ad7f0ba')) + ('libdcp', '8f964bf'), + ('libsub', 'f6cb371')) def configure_options(target): opt = '' diff --git a/src/lib/writer.cc b/src/lib/writer.cc index 49ba41a64..ccd6d74d1 100644 --- a/src/lib/writer.cc +++ b/src/lib/writer.cc @@ -496,6 +496,7 @@ Writer::finish () } dcp::XMLMetadata meta; + meta.annotation_text = cpl->annotation_text (); meta.creator = Config::instance()->dcp_creator (); if (meta.creator.empty ()) { meta.creator = String::compose ("DCP-o-matic %1 %2", dcpomatic_version, dcpomatic_git_commit); -- 2.30.2