Use CPL title for KDM AnnotationTexts.

diff --git a/ChangeLog b/ChangeLog
index d4dfba82cb31942449e9515e95b91e1731c66f23..d3d663aceaac7ed51d3146574af16819c3138c28 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2016-05-16  Carl Hetherington  <cth@carlh.net>
+
+       * Use CPL title for KDM <AnnotationText> nodes.
+
 2016-05-12  Carl Hetherington  <cth@carlh.net>
 
        * Version 2.8.2 released.

diff --git a/cscript b/cscript
index f14aef8d9e99177c19d7e036363749436ed98eb0..1408d2d3f2a5227d919b2d43016e3b2faa05ae63 100644 (file)
--- a/cscript
+++ b/cscript
@@ -229,7 +229,7 @@ def dependencies(target):
         ffmpeg_options = {}
 
     return (('ffmpeg-cdist', 'cd922b8', ffmpeg_options),
-            ('libdcp', 'beb6a30'),
+            ('libdcp', '92bec59'),
             ('libsub', 'v1.1.12'))
 
 def configure_options(target):

diff --git a/src/lib/film.cc b/src/lib/film.cc
index adaa57346ba24ca18592f58ff05e7bf0692377ab..dbcb9f31a1c18c7a5bdc329bdc5bac6a371b8a3f 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -1185,7 +1185,7 @@ Film::make_kdm (
        }
 
        return dcp::DecryptedKDM (
-               cpl, key(), from, until, "DCP-o-matic", cpl->content_title_text(), dcp::LocalTime().as_string()
+               cpl, key(), from, until, cpl->content_title_text(), cpl->content_title_text(), dcp::LocalTime().as_string()
                ).encrypt (signer, recipient, trusted_devices, formulation);
 }