Add --channel option to dcpomatic_create.

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

diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc
index 6d36735e1e271baa81058f613fba391ec1ba9676..d78aef3df117ac346552c0e10386b92f314aac25 100644 (file)
--- a/src/tools/dcpomatic_create.cc
+++ b/src/tools/dcpomatic_create.cc
@@ -18,39 +18,41 @@
 
 */
 
-#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/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 <boost/foreach.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 boost::shared_ptr;
-using boost::dynamic_pointer_cast;
+using std::list;
+using std::make_shared;
+using std::shared_ptr;
+using std::string;
 using boost::optional;
 
 class SimpleSignalManager : public SignalManager
@@ -75,8 +77,8 @@ main (int argc, char* argv[])
        }
 
        if (cc.version) {
-               cerr << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
-               exit (1);
+               cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
+               exit (EXIT_SUCCESS);
        }
 
        if (cc.config_dir) {
@@ -84,50 +86,66 @@ 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) {
                        film->use_template (cc.template_name.get());
                }
                film->set_name (cc.name);
 
-               film->set_container (cc.container_ratio);
+               if (cc.container_ratio) {
+                       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_signed (!cc.no_sign);
                film->set_encrypted (cc.encrypt);
                film->set_three_d (cc.threed);
-               film->set_resolution (cc.fourk ? RESOLUTION_4K : RESOLUTION_2K);
+               if (cc.fourk) {
+                       film->set_resolution (Resolution::FOUR_K);
+               }
+               if (cc.j2k_bandwidth) {
+                       film->set_j2k_bandwidth (*cc.j2k_bandwidth);
+               }
 
-               BOOST_FOREACH (CreateCLI::Content i, cc.content) {
+               for (auto i: cc.content) {
                        boost::filesystem::path const can = boost::filesystem::canonical (i.path);
                        list<shared_ptr<Content> > content;
 
                        if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) {
-                               content.push_back (shared_ptr<DCPContent>(new DCPContent(can)));
+                               content.push_back (make_shared<DCPContent>(can));
                        } else {
                                /* I guess it's not a DCP */
                                content = content_factory (can);
                        }
 
-                       BOOST_FOREACH (shared_ptr<Content> j, content) {
+                       for (auto j: content) {
                                film->examine_and_add_content (j);
                        }
 
                        while (jm->work_to_do ()) {
-                               dcpomatic_sleep (1);
+                               dcpomatic_sleep_seconds (1);
                        }
 
                        while (signal_manager->ui_idle() > 0) {}
 
-                       BOOST_FOREACH (shared_ptr<Content> j, content) {
+                       for (auto j: content) {
                                if (j->video) {
-                                       j->video->set_scale (VideoContentScale(cc.content_ratio));
                                        j->video->set_frame_type (i.frame_type);
                                }
+                               if (j->audio && i.channel) {
+                                       for (auto stream: j->audio->streams()) {
+                                               AudioMapping mapping(stream->channels(), film->audio_channels());
+                                               for (int channel = 0; channel < stream->channels(); ++channel) {
+                                                       mapping.set(channel, *i.channel, 1.0f);
+                                               }
+                                               stream->set_mapping (mapping);
+                                       }
+                               }
                        }
                }
 
@@ -135,15 +153,15 @@ main (int argc, char* argv[])
                        film->set_video_frame_rate (*cc.dcp_frame_rate);
                }
 
-               BOOST_FOREACH (shared_ptr<Content> i, film->content()) {
-                       shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (i);
+               for (auto i: film->content()) {
+                       auto ic = dynamic_pointer_cast<ImageContent> (i);
                        if (ic && ic->still()) {
                                ic->video->set_length (cc.still_length * 24);
                        }
                }
 
                if (jm->errors ()) {
-                       BOOST_FOREACH (shared_ptr<Job> i, jm->get()) {
+                       for (auto i: jm->get()) {
                                if (i->finished_in_error()) {
                                        cerr << i->error_summary() << "\n"
                                             << i->error_details() << "\n";