Allow specification of the CPL ID to use in a DCP with _create (#2302).

[dcpomatic.git] / src / tools / dcpomatic_create.cc

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 8ce7d90a2c9062a73c44165a3b449667e0feeddd..62428b1a24484990e287d8f147f59e3e5d84b829 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -128,6 +128,9 @@ main (int argc, char* argv[])
                                if (cli_content.kdm) {
                                        dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
                                }
+                               if (cli_content.cpl) {
+                                       dcp->set_cpl(*cli_content.cpl);
+                               }
                        } else {
                                /* I guess it's not a DCP */
                                film_content_list = content_factory (can);
@@ -176,8 +179,10 @@ main (int argc, char* argv[])
                if (jm->errors ()) {
                        for (auto i: jm->get()) {
                                if (i->finished_in_error()) {
-                                       cerr << i->error_summary() << "\n"
-                                            << i->error_details() << "\n";
+                                       cerr << i->error_summary() << "\n";
+                                       if (!i->error_details().empty()) {
+                                            cout << i->error_details() << "\n";
+                                       }
                                }
                        }
                        exit (EXIT_FAILURE);