Don't dump empty error details.

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 1d3387f189c5780690fa54e9d461185dbc8af1ba..345c0182bc8215765c9b57de17469f114a51f9e8 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -18,48 +18,53 @@
 
 */
 
-#include "lib/version.h"
-#include "lib/film.h"
-#include "lib/util.h"
+#include "lib/audio_content.h"
+#include "lib/config.h"
 #include "lib/content_factory.h"
-#include "lib/job_manager.h"
-#include "lib/signal_manager.h"
-#include "lib/job.h"
-#include "lib/dcp_content_type.h"
-#include "lib/ratio.h"
-#include "lib/image_content.h"
-#include "lib/video_content.h"
+#include "lib/create_cli.h"
 #include "lib/cross.h"
-#include "lib/config.h"
 #include "lib/dcp_content.h"
-#include "lib/create_cli.h"
-#include "lib/version.h"
+#include "lib/dcp_content_type.h"
 #include "lib/dcpomatic_log.h"
+#include "lib/film.h"
+#include "lib/image_content.h"
+#include "lib/job.h"
+#include "lib/job_manager.h"
+#include "lib/ratio.h"
+#include "lib/signal_manager.h"
+#include "lib/util.h"
+#include "lib/version.h"
+#include "lib/version.h"
+#include "lib/video_content.h"
 #include <dcp/exceptions.h>
 #include <libxml++/libxml++.h>
 #include <boost/filesystem.hpp>
 #include <getopt.h>
-#include <string>
-#include <iostream>
 #include <cstdlib>
+#include <iostream>
 #include <stdexcept>
+#include <string>
+
 
-using std::string;
-using std::cout;
 using std::cerr;
-using std::list;
+using std::cout;
+using std::dynamic_pointer_cast;
 using std::exception;
+using std::list;
+using std::make_shared;
 using std::shared_ptr;
-using std::dynamic_pointer_cast;
+using std::string;
+using std::vector;
 using boost::optional;
 
+
 class SimpleSignalManager : public SignalManager
 {
 public:
        /* Do nothing in this method so that UI events happen in our thread
           when we call SignalManager::ui_idle().
        */
-       void wake_ui () {}
+       void wake_ui () override {}
 };
 
 int
@@ -84,10 +89,10 @@ main (int argc, char* argv[])
        }
 
        signal_manager = new SimpleSignalManager ();
-       JobManager* jm = JobManager::instance ();
+       auto jm = JobManager::instance ();
 
        try {
-               shared_ptr<Film> film (new Film(cc.output_dir));
+               auto film = std::make_shared<Film>(cc.output_dir);
                dcpomatic_log = film->log ();
                dcpomatic_log->set_types (Config::instance()->log_types());
                if (cc.template_name) {
@@ -99,30 +104,37 @@ main (int argc, char* argv[])
                        film->set_container (cc.container_ratio);
                }
                film->set_dcp_content_type (cc.dcp_content_type);
-               film->set_interop (cc.standard == dcp::INTEROP);
+               film->set_interop (cc.standard == dcp::Standard::INTEROP);
                film->set_use_isdcf_name (!cc.no_use_isdcf_name);
                film->set_encrypted (cc.encrypt);
                film->set_three_d (cc.threed);
+               if (cc.twok) {
+                       film->set_resolution (Resolution::TWO_K);
+               }
                if (cc.fourk) {
-                       film->set_resolution (RESOLUTION_4K);
+                       film->set_resolution (Resolution::FOUR_K);
                }
                if (cc.j2k_bandwidth) {
                        film->set_j2k_bandwidth (*cc.j2k_bandwidth);
                }
 
-               for (auto i: cc.content) {
-                       boost::filesystem::path const can = boost::filesystem::canonical (i.path);
-                       list<shared_ptr<Content> > content;
+               for (auto cli_content: cc.content) {
+                       auto const can = boost::filesystem::canonical (cli_content.path);
+                       vector<shared_ptr<Content>> film_content_list;
 
                        if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
-                               content.push_back (shared_ptr<DCPContent>(new DCPContent(can)));
+                               auto dcp = make_shared<DCPContent>(can);
+                               film_content_list.push_back (dcp);
+                               if (cli_content.kdm) {
+                                       dcp->add_kdm (dcp::EncryptedKDM(dcp::file_to_string(*cli_content.kdm)));
+                               }
                        } else {
                                /* I guess it's not a DCP */
-                               content = content_factory (can);
+                               film_content_list = content_factory (can);
                        }
 
-                       for (auto j: content) {
-                               film->examine_and_add_content (j);
+                       for (auto film_content: film_content_list) {
+                               film->examine_and_add_content (film_content);
                        }
 
                        while (jm->work_to_do ()) {
@@ -131,9 +143,21 @@ main (int argc, char* argv[])
 
                        while (signal_manager->ui_idle() > 0) {}
 
-                       for (auto j: content) {
-                               if (j->video) {
-                                       j->video->set_frame_type (i.frame_type);
+                       for (auto film_content: film_content_list) {
+                               if (film_content->video) {
+                                       film_content->video->set_frame_type (cli_content.frame_type);
+                               }
+                               if (film_content->audio && cli_content.channel) {
+                                       for (auto stream: film_content->audio->streams()) {
+                                               AudioMapping mapping(stream->channels(), film->audio_channels());
+                                               for (int channel = 0; channel < stream->channels(); ++channel) {
+                                                       mapping.set(channel, *cli_content.channel, 1.0f);
+                                               }
+                                               stream->set_mapping (mapping);
+                                       }
+                               }
+                               if (film_content->audio && cli_content.gain) {
+                                       film_content->audio->set_gain (*cli_content.gain);
                                }
                        }
                }
@@ -143,7 +167,7 @@ main (int argc, char* argv[])
                }
 
                for (auto i: film->content()) {
-                       shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
+                       auto ic = dynamic_pointer_cast<ImageContent> (i);
                        if (ic && ic->still()) {
                                ic->video->set_length (cc.still_length * 24);
                        }
@@ -152,8 +176,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);