/*
- Copyright (C) 2013 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2013-2015 Carl Hetherington <cth@carlh.net>
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
#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"
+#include "lib/image_content.h"
using std::string;
using std::cout;
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] <CONTENT> [<CONTENT> ...]\n"
+ cerr << "Syntax: " << n << " [OPTION] <CONTENT> [<CONTENT> ...]\n"
<< " -v, --version show DCP-o-matic version\n"
<< " -h, --help show this help\n"
<< " -n, --name <name> film name\n"
<< " -c, --dcp-content-type <type> FTR, SHR, TLR, TST, XSN, RTG, TSR, POL, PSA or ADV\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"
+ << " --container-ratio <ratio> 119, 133, 137, 138, 166, 178, 185 or 239\n"
+ << " --content-ratio <ratio> 119, 133, 137, 138, 166, 178, 185 or 239\n"
+ << " -s, --still-length <n> number of seconds that still content should last\n"
+ << " --standard <standard> SMPTE or interop (default SMPTE)\n"
<< " -o, --output <dir> output directory\n";
}
+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 SignalManager::ui_idle().
+ */
+ void wake_ui () {}
+};
+
int
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'},
{ "dcp-content-type", required_argument, 0, 'c'},
{ "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: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;
}
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;
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;
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;
+ case 's':
+ still_length = atoi (optarg);
+ break;
case 'o':
output = optarg;
break;
}
if (!content_ratio) {
- cerr << "Missing required option --content-ratio.\n";
- help (argv[0]);
+ cerr << argv[0] << ": missing required option --content-ratio.\n";
exit (EXIT_FAILURE);
}
container_ratio = content_ratio;
}
- ui_signaller = new UISignaller ();
+ if (optind == argc) {
+ cerr << argv[0] << ": no content specified.\n";
+ exit (EXIT_FAILURE);
+ }
+
+ signal_manager = new SimpleSignalManager ();
try {
shared_ptr<Film> film (new Film (output, false));
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<Content> c = content_factory (film, argv[i]);
shared_ptr<VideoContent> vc = dynamic_pointer_cast<VideoContent> (c);
}
film->examine_and_add_content (c);
}
-
+
JobManager* jm = JobManager::instance ();
- while (jm->work_to_do ()) {
- ui_signaller->ui_idle ();
+
+ while (jm->work_to_do ()) {}
+ while (signal_manager->ui_idle() > 0) {}
+
+ ContentList content = film->content ();
+ for (ContentList::iterator i = content.begin(); i != content.end(); ++i) {
+ shared_ptr<ImageContent> ic = dynamic_pointer_cast<ImageContent> (*i);
+ if (ic) {
+ ic->set_video_length (still_length * 24);
+ }
}
-
+
if (jm->errors ()) {
list<shared_ptr<Job> > jobs = jm->get ();
for (list<shared_ptr<Job> >::iterator i = jobs.begin(); i != jobs.end(); ++i) {
cerr << argv[0] << ": " << e.what() << "\n";
exit (EXIT_FAILURE);
}
-
+
return 0;
}
projects / dcpomatic.git / blobdiff