X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic_create.cc;h=3d07933e28d68c55443911c5741126e606de0a72;hp=c75f8f9539ffe9f06d9b4d61936304ae038a7301;hb=99428af22969a6cfb1dbd2053a9356bb23b3182f;hpb=a4c19a34244aeaf183c25878933b570fc5c0ee34 diff --git a/src/tools/dcpomatic_create.cc b/src/tools/dcpomatic_create.cc index c75f8f953..3d07933e2 100644 --- a/src/tools/dcpomatic_create.cc +++ b/src/tools/dcpomatic_create.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2013 Carl Hetherington + Copyright (C) 2013-2015 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -28,7 +28,7 @@ #include "lib/util.h" #include "lib/content_factory.h" #include "lib/job_manager.h" -#include "lib/ui_signaller.h" +#include "lib/signal_manager.h" #include "lib/job.h" #include "lib/dcp_content_type.h" #include "lib/ratio.h" @@ -43,12 +43,9 @@ using boost::shared_ptr; using boost::dynamic_pointer_cast; static void -help (string n) +syntax (string n) { - cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n" - << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n" - << "will be written to stdout.\n" - << "Syntax: " << n << " [OPTION] [ ...]\n" + cerr << "Syntax: " << n << " [OPTION] [ ...]\n" << " -v, --version show DCP-o-matic version\n" << " -h, --help show this help\n" << " -n, --name film name\n" @@ -56,14 +53,23 @@ help (string n) << " --container-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" << " --content-ratio 119, 133, 137, 138, 166, 178, 185 or 239\n" << " -s, --still-length number of seconds that still content should last\n" + << " --standard SMPTE or interop (default SMPTE)\n" << " -o, --output output directory\n"; } -class SimpleUISignaller : public UISignaller +static void +help (string n) +{ + cerr << "Create a film directory (ready for making a DCP) or metadata file from some content files.\n" + << "A film directory will be created if -o or --output is specified, otherwise a metadata file\n" + << "will be written to stdout.\n"; +} + +class SimpleSignalManager : public SignalManager { public: /* Do nothing in this method so that UI events happen in our thread - when we call UISignaller::ui_idle(). + when we call SignalManager::ui_idle(). */ void wake_ui () {} }; @@ -74,14 +80,15 @@ main (int argc, char* argv[]) dcpomatic_setup (); string name; - DCPContentType const * dcp_content_type = DCPContentType::from_dci_name ("TST"); + DCPContentType const * dcp_content_type = DCPContentType::from_isdcf_name ("TST"); Ratio const * container_ratio = 0; Ratio const * content_ratio = 0; int still_length = 10; + dcp::Standard standard = dcp::SMPTE; boost::filesystem::path output; - + int option_index = 0; - while (1) { + while (true) { static struct option long_options[] = { { "version", no_argument, 0, 'v'}, { "help", no_argument, 0, 'h'}, @@ -90,11 +97,12 @@ main (int argc, char* argv[]) { "container-ratio", required_argument, 0, 'A'}, { "content-ratio", required_argument, 0, 'B'}, { "still-length", required_argument, 0, 's'}, + { "standard", required_argument, 0, 'C'}, { "output", required_argument, 0, 'o'}, { 0, 0, 0, 0} }; - int c = getopt_long (argc, argv, "vhn:c:A:B:s:o:", long_options, &option_index); + int c = getopt_long (argc, argv, "vhn:c:A:B:C:s:o:", long_options, &option_index); if (c == -1) { break; } @@ -110,10 +118,10 @@ main (int argc, char* argv[]) name = optarg; break; case 'c': - dcp_content_type = DCPContentType::from_dci_name (optarg); + dcp_content_type = DCPContentType::from_isdcf_name (optarg); if (dcp_content_type == 0) { cerr << "Bad DCP content type.\n"; - help (argv[0]); + syntax (argv[0]); exit (EXIT_FAILURE); } break; @@ -121,7 +129,7 @@ main (int argc, char* argv[]) container_ratio = Ratio::from_id (optarg); if (container_ratio == 0) { cerr << "Bad container ratio.\n"; - help (argv[0]); + syntax (argv[0]); exit (EXIT_FAILURE); } break; @@ -129,7 +137,16 @@ main (int argc, char* argv[]) content_ratio = Ratio::from_id (optarg); if (content_ratio == 0) { cerr << "Bad content ratio " << optarg << ".\n"; - help (argv[0]); + syntax (argv[0]); + exit (EXIT_FAILURE); + } + break; + case 'C': + if (strcmp (optarg, "interop") == 0) { + standard = dcp::INTEROP; + } else if (strcmp (optarg, "SMPTE") != 0) { + cerr << "Bad standard " << optarg << ".\n"; + syntax (argv[0]); exit (EXIT_FAILURE); } break; @@ -161,7 +178,7 @@ main (int argc, char* argv[]) exit (EXIT_FAILURE); } - ui_signaller = new SimpleUISignaller (); + signal_manager = new SimpleSignalManager (); try { shared_ptr film (new Film (output, false)); @@ -171,7 +188,8 @@ main (int argc, char* argv[]) film->set_container (container_ratio); film->set_dcp_content_type (dcp_content_type); - + film->set_interop (standard == dcp::INTEROP); + for (int i = optind; i < argc; ++i) { shared_ptr c = content_factory (film, argv[i]); shared_ptr vc = dynamic_pointer_cast (c); @@ -180,17 +198,17 @@ main (int argc, char* argv[]) } film->examine_and_add_content (c); } - + JobManager* jm = JobManager::instance (); while (jm->work_to_do ()) {} - while (ui_signaller->ui_idle() > 0) {} + while (signal_manager->ui_idle() > 0) {} ContentList content = film->content (); for (ContentList::iterator i = content.begin(); i != content.end(); ++i) { shared_ptr ic = dynamic_pointer_cast (*i); if (ic) { - ic->set_video_length (ContentTime::from_seconds (still_length)); + ic->set_video_length (still_length * 24); } } @@ -214,6 +232,6 @@ main (int argc, char* argv[]) cerr << argv[0] << ": " << e.what() << "\n"; exit (EXIT_FAILURE); } - + return 0; }