Add recipient name as a magic value in DKDM output filenames.

diff --git a/src/lib/dkdm_recipient.cc b/src/lib/dkdm_recipient.cc
index c68c915d5cefbf61171909542c968b3e348979d9..6e86d7b93576adf5056ee0dee10dc78044b53c1b 100644 (file)
--- a/src/lib/dkdm_recipient.cc
+++ b/src/lib/dkdm_recipient.cc
@@ -58,6 +58,7 @@ kdm_for_dkdm_recipient (
 
        dcp::NameFormat::Map name_values;
        name_values['f'] = kdm.content_title_text();
+       name_values['r'] = recipient.name;
        name_values['i'] = kdm.cpl_id();
 
        return make_shared<KDMWithMetadata>(name_values, CinemaID(0), recipient.emails, kdm);

diff --git a/src/wx/dkdm_output_panel.cc b/src/wx/dkdm_output_panel.cc
index 66f6dab71cad9943e56779843df9eff5db559637..f8331a91f49bbcc4b38cbb9306d93605ae9b5e18 100644 (file)
--- a/src/wx/dkdm_output_panel.cc
+++ b/src/wx/dkdm_output_panel.cc
@@ -65,8 +65,10 @@ DKDMOutputPanel::DKDMOutputPanel(wxWindow* parent)
        add_label_to_sizer(table, this, _("Filename format"), true, 0, wxALIGN_TOP | wxTOP | wxLEFT | wxRIGHT);
        dcp::NameFormat::Map titles;
        titles['f'] = wx_to_std(_("film name"));
+       titles['r'] = wx_to_std(_("recipient name"));
        dcp::NameFormat::Map ex;
        ex['f'] = "Bambi";
+       ex['r'] = "Pathé";
        _filename_format = new NameFormatEditor(this, Config::instance()->dkdm_filename_format(), titles, ex, ".xml");
        table->Add(_filename_format->panel(), 1, wxEXPAND);