summaryrefslogtreecommitdiff
path: root/src/lib/spl_entry.cc
diff options
context:
space:
mode:
authorCarl Hetherington <cth@carlh.net>2025-06-17 22:35:39 +0200
committerCarl Hetherington <cth@carlh.net>2025-07-03 22:46:34 +0200
commitd4019480147bd6b478f8b067982c53251e5d6f15 (patch)
tree9cf10f9655b7ef332d3362da32eba4000cd1fe4d /src/lib/spl_entry.cc
parentb4c7d661a2c7b072d18e82129ff0a31a99ba5081 (diff)
Add all DCP CPLs to the content list, and write CPL ID to SPLs instead of digest (#3040).
Diffstat (limited to 'src/lib/spl_entry.cc')
-rw-r--r--src/lib/spl_entry.cc8
1 files changed, 6 insertions, 2 deletions
diff --git a/src/lib/spl_entry.cc b/src/lib/spl_entry.cc
index a77b0b7d5..f5e7c9644 100644
--- a/src/lib/spl_entry.cc
+++ b/src/lib/spl_entry.cc
@@ -40,7 +40,7 @@ SPLEntry::SPLEntry (shared_ptr<Content> c)
if (dcp) {
name = dcp->name ();
DCPOMATIC_ASSERT (dcp->cpl());
- id = *dcp->cpl();
+ id = dcp->cpl();
kind = dcp->content_kind().get_value_or(dcp::ContentKind::FEATURE);
encrypted = dcp->encrypted ();
} else {
@@ -53,5 +53,9 @@ SPLEntry::SPLEntry (shared_ptr<Content> c)
void
SPLEntry::as_xml (xmlpp::Element* e)
{
- cxml::add_text_child(e, "Digest", digest);
+ if (id) {
+ cxml::add_text_child(e, "CPL", *id);
+ } else {
+ cxml::add_text_child(e, "Digest", digest);
+ }
}