#include "film.h"
#include "filter.h"
#include "transcode_job.h"
-#include "make_dcp_job.h"
#include "job_manager.h"
#include "ab_transcode_job.h"
#include "util.h"
#include "config.h"
#include "log.h"
-using namespace std;
-using namespace boost;
+using std::string;
+using std::cerr;
+using std::cout;
+using std::vector;
+using std::pair;
+using std::list;
+using boost::shared_ptr;
static void
help (string n)
{
cerr << "Syntax: " << n << " [OPTION] <FILM>\n"
- << " -v, --version show DVD-o-matic version\n"
+ << " -v, --version show DCP-o-matic version\n"
<< " -h, --help show this help\n"
- << " -d, --deps list DVD-o-matic dependency details and quit\n"
- << " -c, --config list configuration settings that affect output and quit\n"
+ << " -d, --deps list DCP-o-matic dependency details and quit\n"
<< " -t, --test run in test mode (repeatable UUID generation, timestamps etc.)\n"
<< " -n, --no-progress do not print progress to stdout\n"
<< " -r, --no-remote do not use any remote servers\n"
{ "version", no_argument, 0, 'v'},
{ "help", no_argument, 0, 'h'},
{ "deps", no_argument, 0, 'd'},
- { "config", no_argument, 0, 'c'},
{ "test", no_argument, 0, 't'},
{ "no-progress", no_argument, 0, 'n'},
{ "no-remote", no_argument, 0, 'r'},
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhdctnrl:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhdtnrl:", long_options, &option_index);
if (c == -1) {
break;
switch (c) {
case 'v':
- cout << "dvdomatic version " << dvdomatic_version << " " << dvdomatic_git_commit << "\n";
+ cout << "dcpomatic version " << dcpomatic_version << " " << dcpomatic_git_commit << "\n";
exit (EXIT_SUCCESS);
case 'h':
help (argv[0]);
case 'r':
no_remote = true;
break;
- case 'c':
- cout << "Colour LUT " << colour_lut_index_to_name (Config::instance()->colour_lut_index()) << "; "
- << "J2K bandwidth " << Config::instance()->j2k_bandwidth() << "; ";
-#ifdef DVDOMATIC_DEBUG
- cout << "built in debug mode\n";
-#else
- cout << "built in optimised mode\n";
-#endif
- exit (EXIT_SUCCESS);
case 'l':
log_level = atoi (optarg);
break;
film_dir = argv[optind];
- dvdomatic_setup ();
+ dcpomatic_setup ();
if (no_remote) {
Config::instance()->set_servers (vector<ServerDescription*> ());
}
- cout << "DVD-o-matic " << dvdomatic_version << " git " << dvdomatic_git_commit;
+ cout << "DCP-o-matic " << dcpomatic_version << " git " << dcpomatic_git_commit;
char buf[256];
if (gethostname (buf, 256) == 0) {
cout << " on " << buf;
cout << dependency_version_summary() << "\n";
}
- Film* film = 0;
+ shared_ptr<Film> film;
try {
- film = new Film (film_dir, true);
+ film.reset (new Film (film_dir, true));
} catch (std::exception& e) {
cerr << argv[0] << ": error reading film `" << film_dir << "' (" << e.what() << ")\n";
exit (EXIT_FAILURE);
film->log()->set_level ((Log::Level) log_level);
cout << "\nMaking ";
- if (film->dcp_ab()) {
+ if (film->ab()) {
cout << "A/B ";
}
cout << "DCP for " << film->name() << "\n";
cout << "Test mode: " << (test_mode ? "yes" : "no") << "\n";
- cout << "Content: " << film->content() << "\n";
+// cout << "Content: " << film->content() << "\n";
pair<string, string> const f = Filter::ffmpeg_strings (film->filters ());
cout << "Filters: " << f.first << " " << f.second << "\n";
- film->make_dcp (true);
+ film->make_dcp ();
bool should_stop = false;
bool first = true;
+ bool error = false;
while (!should_stop) {
- dvdomatic_sleep (5);
+ dcpomatic_sleep (5);
list<shared_ptr<Job> > jobs = JobManager::instance()->get ();
if ((*i)->finished_in_error ()) {
++finished_in_error;
+ error = true;
}
if (!progress && (*i)->finished_in_error ()) {
}
}
- return 0;
+ return error ? EXIT_FAILURE : EXIT_SUCCESS;
}