#include "lib/audio_content.h"
#include "lib/dcpomatic_log.h"
#include <dcp/version.h>
-#include <boost/foreach.hpp>
#include <getopt.h>
#include <iostream>
#include <iomanip>
using std::pair;
using std::setw;
using std::list;
-using boost::shared_ptr;
+using std::shared_ptr;
using boost::optional;
-using boost::dynamic_pointer_cast;
+using std::dynamic_pointer_cast;
static void
help (string n)
<< " -d, --dcp-path echo DCP's path to stdout on successful completion (implies -n)\n"
<< " -c, --config <dir> directory containing config.xml and cinemas.xml\n"
<< " --dump just dump a summary of the film's settings; don't encode\n"
+ << " --no-check don't check project's content files for changes before making the DCP\n"
<< "\n"
<< "<FILM> is the film directory.\n";
}
<< "Output " << film->video_frame_rate() << "fps " << (film->three_d() ? "3D" : "2D") << " " << (film->audio_frame_rate() / 1000) << "kHz\n"
<< (film->interop() ? "Inter-Op" : "SMPTE") << " " << (film->encrypted() ? "encrypted" : "unencrypted") << "\n";
- BOOST_FOREACH (shared_ptr<Content> c, film->content ()) {
+ for (auto c: film->content()) {
cout << "\n"
<< c->path(0) << "\n"
<< "\tat " << c->position().seconds ()
<< "\tcrop left " << c->video->left_crop()
<< " right " << c->video->right_crop()
<< " top " << c->video->top_crop()
- << " bottom " << c->video->bottom_crop() << "\n"
- << "\tscale " << c->video->scale().name() << "\n";
+ << " bottom " << c->video->bottom_crop() << "\n";
+ if (c->video->custom_ratio()) {
+ cout << "\tscale to custom ratio " << *c->video->custom_ratio() << ":1\n";
+ }
if (c->video->colour_conversion()) {
if (c->video->colour_conversion().get().preset()) {
cout << "\tcolour conversion "
++N;
/* Report the state of configured servers */
- BOOST_FOREACH (string i, Config::instance()->servers()) {
+ for (auto i: Config::instance()->servers()) {
cout << std::left << setw(24) << i << " ";
/* See if this server is on the active list; if so, remove it and note
}
/* Now report any left that have been found by broadcast */
- BOOST_FOREACH (EncodeServerDescription const & i, servers) {
+ for (auto const& i: servers) {
if (i.current_link_version()) {
cout << std::left << setw(24) << i.host_name() << " UP " << i.threads() << "\n";
} else {
}
}
- dcpomatic_sleep (1);
+ dcpomatic_sleep_seconds (1);
for (int i = 0; i < N; ++i) {
cout << "\033[1A\033[2K";
bool list_servers_ = false;
bool dcp_path = false;
optional<boost::filesystem::path> config;
+ bool check = true;
int option_index = 0;
while (true) {
{ "config", required_argument, 0, 'c' },
/* Just using A, B, C ... from here on */
{ "dump", no_argument, 0, 'A' },
+ { "no-check", no_argument, 0, 'B' },
{ 0, 0, 0, 0 }
};
- int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:", long_options, &option_index);
+ int c = getopt_long (argc, argv, "vhfnrt:j:kAs:ldc:B", long_options, &option_index);
if (c == -1) {
break;
case 'c':
config = optarg;
break;
+ case 'B':
+ check = false;
+ break;
}
}
cout << "\nMaking DCP for " << film->name() << "\n";
}
- film->make_dcp ();
+ film->make_dcp (false, check);
bool const error = show_jobs_on_console (progress);
if (keep_going) {
while (true) {
- dcpomatic_sleep (3600);
+ dcpomatic_sleep_seconds (3600);
}
}