Add the "Multiple Modified Transitional 1" KDM formulation.

diff --git a/src/tools/dcpomatic_kdm_cli.cc b/src/tools/dcpomatic_kdm_cli.cc
index 3287fc651db94a1e661d6102e0efe8a590e70930..e3066441e159ac29073bc8bf9cd0f16faa95de55 100644 (file)
--- 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 1a4a209ca46719602ec1c61d46034ccac0d3838d..3befd702562e2254c5f45bfecff1263a3b1ba72b 100644 (file)
--- 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));