pot/merge.

[dcpomatic.git] / src / lib / dkdm_recipient.cc

diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index 30c3075691d4baa1a81130ade548227d63c84e35..f25934083170d35920c1069d8afdd89d0ba0c8a7 100644 (file)
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -20,9 +20,10 @@
 
 
 #include "dkdm_recipient.h"
-#include "kdm_with_metadata.h"
 #include "film.h"
+#include "kdm_with_metadata.h"
 #include <dcp/raw_convert.h>
+#include <dcp/utc_offset.h>
 
 
 using std::make_shared;
@@ -68,11 +69,11 @@ kdm_for_dkdm_recipient (
        )
 {
        if (!recipient->recipient) {
-               return KDMWithMetadataPtr();
+               return {};
        }
 
-       dcp::LocalTime const begin(valid_from, recipient->utc_offset_hour, recipient->utc_offset_minute);
-       dcp::LocalTime const end  (valid_to,   recipient->utc_offset_hour, recipient->utc_offset_minute);
+       dcp::LocalTime const begin(valid_from, dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
+       dcp::LocalTime const end  (valid_to,   dcp::UTCOffset(recipient->utc_offset_hour, recipient->utc_offset_minute));
 
        auto const kdm = film->make_kdm (
                        recipient->recipient.get(),
@@ -86,7 +87,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();