From 91ce56edbb31d6bb588ce31b6eb4c5e420b68a23 Mon Sep 17 00:00:00 2001 From: Mart Jansink Date: Fri, 9 Feb 2018 11:22:44 +0100 Subject: [PATCH] Add the "Multiple Modified Transitional 1" KDM formulation. --- src/tools/dcpomatic_kdm_cli.cc | 4 +++- src/wx/kdm_output_panel.cc | 1 + 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc index 3287fc651..e3066441e 100644 --- a/src/tools/dcpomatic_kdm_cli.cc +++ b/src/tools/dcpomatic_kdm_cli.cc @@ -56,7 +56,7 @@ help () " -f, --valid-from valid from time (in local time zone of the cinema) (e.g. \"2013-09-28 01:41:51\") or \"now\"\n" " -t, --valid-to valid to time (in local time zone of the cinema) (e.g. \"2014-09-28 01:41:51\")\n" " -d, --valid-duration valid duration (e.g. \"1 day\", \"4 hours\", \"2 weeks\")\n" - " --formulation modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n" + " --formulation modified-transitional-1, multiple-modified-transitional-1, dci-any or dci-specific [default modified-transitional-1]\n" " -z, --zip ZIP each cinema's KDMs into its own file\n" " -v, --verbose be verbose\n" " -c, --cinema specify a cinema, either by name or email address\n" @@ -481,6 +481,8 @@ int main (int argc, char* argv[]) case 'C': if (string (optarg) == "modified-transitional-1") { formulation = dcp::MODIFIED_TRANSITIONAL_1; + } else if (string (optarg) == "multiple-modified-transitional-1") { + formulation = dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1; } else if (string (optarg) == "dci-any") { formulation = dcp::DCI_ANY; } else if (string (optarg) == "dci-specific") { diff --git a/src/wx/kdm_output_panel.cc b/src/wx/kdm_output_panel.cc index 1a4a209ca..3befd7025 100644 --- a/src/wx/kdm_output_panel.cc +++ b/src/wx/kdm_output_panel.cc @@ -52,6 +52,7 @@ KDMOutputPanel::KDMOutputPanel (wxWindow* parent, bool interop) add_label_to_sizer (table, this, _("KDM type"), true); _type = new wxChoice (this, wxID_ANY); _type->Append ("Modified Transitional 1", ((void *) dcp::MODIFIED_TRANSITIONAL_1)); + _type->Append ("Multiple Modified Transitional 1", ((void *) dcp::MULTIPLE_MODIFIED_TRANSITIONAL_1)); _type->Append ("Modified Transitional 1 (without AuthorizedDeviceInfo)", ((void *) dcp::MODIFIED_TRANSITIONAL_TEST)); if (!interop) { _type->Append ("DCI Any", ((void *) dcp::DCI_ANY)); -- 2.30.2