export LD_LIBRARY_PATH=build/src/lib:build/src/wx:build/src/asdcplib/src:$LD_LIBRARY_PATH
if [ "$1" == "--debug" ]; then
shift
- gdb --args build/src/tools/dcpomatic_create $*
+ gdb --args build/src/tools/dcpomatic2_create $*
elif [ "$1" == "--valgrind" ]; then
shift
- valgrind --tool="memcheck" build/src/tools/dcpomatic_create $*
+ valgrind --tool="memcheck" build/src/tools/dcpomatic2_create $*
elif [ "$1" == "--callgrind" ]; then
shift
- valgrind --tool="callgrind" build/src/tools/dcpomatic_create $*
+ valgrind --tool="callgrind" build/src/tools/dcpomatic2_create $*
elif [ "$1" == "--perf" ]; then
shift
- perf record build/src/tools/dcpomatic_create $*
+ perf record build/src/tools/dcpomatic2_create $*
else
- build/src/tools/dcpomatic_create $*
+ build/src/tools/dcpomatic2_create $*
fi
/*
- 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
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"
<< " --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:
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;
{ "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;
}
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;
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]);