X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=4c40c24d3ce2384970e5b12ce39353a84888b655;hb=6e0f867a69cf4e337370edc986347218afde548e;hp=1dfabd296a30390598532cd9163da76fa4b7128a;hpb=985e727e001e1a92ae035364a9cbf1ff99522ff1;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 1dfabd296..4c40c24d3 100644 --- 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 #include #include -#include #include -#include -#include #include +#include #include +#include -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 @@ -59,7 +61,7 @@ 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 @@ -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,48 +86,73 @@ main (int argc, char* argv[]) } signal_manager = new SimpleSignalManager (); - JobManager* jm = JobManager::instance (); + auto jm = JobManager::instance (); try { - shared_ptr film (new Film(cc.output_dir)); + auto film = std::make_shared(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); + if (cc.twok) { + film->set_resolution (Resolution::TWO_K); + } + 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) { - boost::filesystem::path const can = boost::filesystem::canonical (i.path); - list > content; + for (auto cli_content: cc.content) { + auto const can = boost::filesystem::canonical (cli_content.path); + list> film_content_list; if (boost::filesystem::exists (can / "ASSETMAP") || (boost::filesystem::exists (can / "ASSETMAP.xml"))) { - content.push_back (shared_ptr(new DCPContent(can))); + auto dcp = make_shared(can); + film_content_list.push_back (dcp); + 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); } - BOOST_FOREACH (shared_ptr 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 ()) { - dcpomatic_sleep (1); + dcpomatic_sleep_seconds (1); } while (signal_manager->ui_idle() > 0) {} - BOOST_FOREACH (shared_ptr j, content) { - if (j->video) { - j->video->set_scale (VideoContentScale(cc.content_ratio)); - 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); } } } @@ -134,15 +161,15 @@ main (int argc, char* argv[]) film->set_video_frame_rate (*cc.dcp_frame_rate); } - BOOST_FOREACH (shared_ptr i, film->content()) { - shared_ptr ic = dynamic_pointer_cast (i); + for (auto i: film->content()) { + auto ic = dynamic_pointer_cast (i); if (ic && ic->still()) { ic->video->set_length (cc.still_length * 24); } } if (jm->errors ()) { - BOOST_FOREACH (shared_ptr i, jm->get()) { + for (auto i: jm->get()) { if (i->finished_in_error()) { cerr << i->error_summary() << "\n" << i->error_details() << "\n";