X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=5b5f4dba2455f48739679a9f62a06d80ea3ada26;hb=85b2143644d8faf16252666f738d5fda01fc1869;hp=8dc4de50ef278dc66a02b9964a9fd146607086a9;hpb=08b57ee2ed41b9de995080ff7b4fd84d8cec4002;p=dcpomatic.git diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index 8dc4de50e..5b5f4dba2 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,136 +1,178 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2019 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ -#include -#include -#include -#include -#include -#include -#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/ui_signaller.h" +#include "lib/create_cli.h" +#include "lib/cross.h" +#include "lib/dcp_content.h" +#include "lib/dcp_content_type.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 + -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 std::list; +using std::make_shared; +using std::shared_ptr; +using std::string; +using std::vector; +using boost::optional; + -static void -help (string n) +class SimpleSignalManager : public SignalManager { - cerr << "Create a film directory (ready for making a DCP) from some content files.\n" - << "Syntax: " << n << " [OPTION] [ ...]\n" - << " -v, --version show DCP-o-matic version\n" - << " -h, --help show this help\n" - << " -n, --name film name\n" - << " -o, --output output directory (required)\n"; -} +public: + /* Do nothing in this method so that UI events happen in our thread + when we call SignalManager::ui_idle(). + */ + void wake_ui () override {} +}; int main (int argc, char* argv[]) { - string name; - boost::filesystem::path output; - - int option_index = 0; - while (1) { - static struct option long_options[] = { - { "version", no_argument, 0, 'v'}, - { "help", no_argument, 0, 'h'}, - { "name", required_argument, 0, 'n'}, - { "output", required_argument, 0, 'o'}, - { 0, 0, 0, 0} - }; - - int c = getopt_long (argc, argv, "vhn:o:", long_options, &option_index); - if (c == -1) { - break; - } + dcpomatic_setup_path_encoding (); + dcpomatic_setup (); - switch (c) { - case 'v': - cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; - exit (EXIT_SUCCESS); - case 'h': - help (argv[0]); - exit (EXIT_SUCCESS); - case 'n': - name = optarg; - break; - case 'o': - output = optarg; - break; - } + CreateCLI cc (argc, argv); + if (cc.error) { + cerr << *cc.error << "\n"; + exit (1); } - if (optind > argc) { - help (argv[0]); - exit (EXIT_FAILURE); + if (cc.version) { + cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n"; + exit (EXIT_SUCCESS); } - if (output.empty ()) { - cerr << "Missing required option -o or --output.\n" - << "Use " << argv[0] << " --help for help.\n"; - exit (EXIT_FAILURE); + if (cc.config_dir) { + State::override_path = *cc.config_dir; } - dcpomatic_setup (); - ui_signaller = new UISignaller (); + signal_manager = new SimpleSignalManager (); + auto jm = JobManager::instance (); try { - shared_ptr film (new Film (output)); - if (!name.empty ()) { - film->set_name (name); + auto film = cc.make_film(); + + for (auto cli_content: cc.content) { + auto const can = dcp::filesystem::canonical(cli_content.path); + vector> film_content_list; + + if (dcp::filesystem::exists(can / "ASSETMAP") || (dcp::filesystem::exists(can / "ASSETMAP.xml"))) { + auto dcp = make_shared(can); + film_content_list.push_back (dcp); + 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); + } + + for (auto film_content: film_content_list) { + film->examine_and_add_content (film_content); + } + + while (jm->work_to_do ()) { + dcpomatic_sleep_seconds (1); + } + + while (signal_manager->ui_idle() > 0) {} + + 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); + } + } } - - for (int i = optind; i < argc; ++i) { - film->examine_and_add_content (content_factory (film, argv[i])); + + if (cc.dcp_frame_rate) { + film->set_video_frame_rate (*cc.dcp_frame_rate); } - - JobManager* jm = JobManager::instance (); - while (jm->work_to_do ()) { - ui_signaller->ui_idle (); + + for (auto i: film->content()) { + auto ic = dynamic_pointer_cast (i); + if (ic && ic->still()) { + ic->video->set_length(cc.still_length.get_value_or(10) * 24); + } } - + if (jm->errors ()) { - list > jobs = jm->get (); - for (list >::iterator i = jobs.begin(); i != jobs.end(); ++i) { - if ((*i)->finished_in_error ()) { - cerr << (*i)->error_summary () << "\n" - << (*i)->error_details () << "\n"; + for (auto i: jm->get()) { + if (i->finished_in_error()) { + cerr << i->error_summary() << "\n"; + if (!i->error_details().empty()) { + cout << i->error_details() << "\n"; + } } } exit (EXIT_FAILURE); } - - film->write_metadata (); + + if (cc.output_dir) { + film->write_metadata (); + } else { + film->metadata()->write_to_stream_formatted(cout, "UTF-8"); + } } catch (exception& e) { cerr << argv[0] << ": " << e.what() << "\n"; exit (EXIT_FAILURE); } - + return 0; }