X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fdkdm_recipient.cc;h=ff19aa265b050e05d7c267cebe67dd9eebdcb66d;hb=182b9d2e2feb6545592868606aaf0f0146095481;hp=30c3075691d4baa1a81130ade548227d63c84e35;hpb=689fa55d1529ad88449ca464e9107c4dcc54d1cb;p=dcpomatic.git diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc index 30c307569..ff19aa265 100644 --- a/src/lib/dkdm_recipient.cc +++ b/src/lib/dkdm_recipient.cc @@ -20,8 +20,8 @@ #include "dkdm_recipient.h" -#include "kdm_with_metadata.h" #include "film.h" +#include "kdm_with_metadata.h" #include @@ -68,7 +68,7 @@ kdm_for_dkdm_recipient ( ) { if (!recipient->recipient) { - return KDMWithMetadataPtr(); + return {}; } dcp::LocalTime const begin(valid_from, recipient->utc_offset_hour, recipient->utc_offset_minute); @@ -86,7 +86,7 @@ kdm_for_dkdm_recipient ( ); dcp::NameFormat::Map name_values; - name_values['f'] = film->name(); + name_values['f'] = kdm.content_title_text(); name_values['b'] = begin.date() + " " + begin.time_of_day(true, false); name_values['e'] = end.date() + " " + end.time_of_day(true, false); name_values['i'] = kdm.cpl_id();